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 3b0daa73694..7bc2b74c6fa 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject1.lazy.log
@@ -19,29 +19,52 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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> = 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@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> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
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 ac9d48af638..69104247468 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObject2.lazy.log
@@ -22,29 +22,58 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('A': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('A': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('A': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('A': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('A': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+}
+
+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@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> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
 }
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 94711935f63..e1b1864eb71 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass1.lazy.log
@@ -20,26 +20,60 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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> = 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@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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 e3d4a95c6f5..0c7d3dbf773 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnClassObjectOfNestedClass2.lazy.log
@@ -20,30 +20,53 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Nested': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Nested': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('Nested': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Nested': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Nested': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('Nested': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('Nested': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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> = 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@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@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
 }
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 94711935f63..1e805835a8b 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum1.lazy.log
@@ -20,26 +20,60 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 94711935f63..874131ca86a 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnEnum2.lazy.log
@@ -20,26 +20,68 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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]
+    <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@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]
+    <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 51e027a3055..657ec72c0bc 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum1.lazy.log
@@ -20,30 +20,53 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('ONE': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('ONE': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('ONE': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('ONE': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('ONE': Name@25) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('ONE': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('ONE': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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@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@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
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 c4121453214..cfc3e7c9d9b 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnImportedEnum2.lazy.log
@@ -22,30 +22,59 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('ONE': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('ONE': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('ONE': Name@26) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('lang': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('ONE': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('ONE': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('ONE': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('ONE': Name@26) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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]
+    <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@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 }
 }
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 ee825bf061a..83f59d8e824 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject1.lazy.log
@@ -21,29 +21,58 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('A': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+    <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@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 }
 }
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 3b0daa73694..dfe172b774a 100644
--- a/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log
+++ b/compiler/testData/codegen/box/functions/invoke/onObjects/invokeOnObject2.lazy.log
@@ -19,29 +19,52 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('A': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/defaultArgs.lazy.log
index 10a739eaa2d..74a6e096225 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@35['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@38
     typeConstructor = DeserializedClassTypeConstructor@32
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@35['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
 }
@@ -136,42 +136,93 @@ LazyJavaPackageFragment@56['<root>'] {
     classes('IllegalArgumentException': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('compareTo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('not': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('tailRecursive': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('test': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('IllegalArgumentException': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('compareTo': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('not': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('test': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('tailRecursive': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('test': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('IllegalArgumentException': Name@79) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('test': Name@83) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('lang': Name@89) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
 LazyJavaPackageFragment@63['lang'] {
-    classes('IllegalArgumentException': Name@79) = LazyJavaClassDescriptor@5['IllegalArgumentException'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('compareTo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('not': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('test': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('IllegalArgumentException': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('compareTo': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('not': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('test': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('IllegalArgumentException': Name@79) = LazyJavaClassDescriptor@5['IllegalArgumentException'] // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('test': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('IllegalArgumentException': Name@79) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('test': Name@83) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
+}
+
+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]
+    <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@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[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <name not found> = ArrayList@130[4] { ResolutionCandidate@127, ResolutionCandidate@128, ResolutionCandidate@129, ... }
+    <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 c82e75bd7af..ad526d184c6 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/extensionTailCall.lazy.log
@@ -24,31 +24,68 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 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@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { 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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log
index bb4b5ef211e..4a85eeb8988 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNoTails.lazy.log
@@ -40,3 +40,17 @@ LazyJavaPackageFragment@10['lang'] {
     functions('noTails': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+}
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
index 39af0125778..025fe763225 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/functionWithNonTailRecursions.lazy.log
@@ -34,39 +34,169 @@ LazyJavaPackageFragment@10['<root>'] {
     classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('String': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('suppress': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('tailRecursive': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('minus': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('suppress': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('tailRecursive': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('badTails': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('compareTo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('equals': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('badTails': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('compareTo': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('equals': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('minus': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('plus': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('badTails': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('badTails': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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 }
+    <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@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@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 }
+}
+
+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 }
+}
+
+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[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { 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[7] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+    <name not found> = ArrayList@128[7] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127, ... }
+}
+
+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, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log
index 2ad9c950615..8a7e363abc3 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/functionWithoutAnnotation.lazy.log
@@ -20,38 +20,80 @@ LazyJavaPackageFragmentProvider@1 {
 LazyJavaPackageFragment@3['<root>'] {
     classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('compareTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('minus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('withoutAnnotation': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('compareTo': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('minus': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('plus': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('withoutAnnotation': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('withoutAnnotation': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('withoutAnnotation': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('compareTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('minus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('withoutAnnotation': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('compareTo': Name@20) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('minus': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('withoutAnnotation': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('withoutAnnotation': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('withoutAnnotation': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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]
+    <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@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@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[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log
index 2bf2be1d34b..457c5571f10 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/infixCall.lazy.log
@@ -24,35 +24,73 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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@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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log
index 524803cbc5f..03674d240f8 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/infixRecursiveCall.lazy.log
@@ -28,31 +28,73 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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@12['lang'] {
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@26) = 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@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]
+    <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@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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log
index 2bf2be1d34b..b9e532ada2b 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/insideElvis.lazy.log
@@ -24,35 +24,132 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('equals': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('test': 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@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]
+}
+
+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@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@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@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@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 }
+}
+
+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[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@97[7] { 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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log
index 7874c903608..02faff70efb 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/labeledThisReferences.lazy.log
@@ -39,45 +39,112 @@ LazyJavaPackageFragment@8['<root>'] {
     classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('Int': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('B': Name@34) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('C': Name@35) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('compareTo': Name@38) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('h': Name@39) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('h2': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('makeC': Name@41) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('minus': Name@42) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('tailRecursive': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('B': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('C': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('h2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('makeC': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('B': Name@34) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('C': Name@35) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('compareTo': Name@38) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('h': Name@39) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('h2': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('makeC': Name@41) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('minus': Name@42) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('B': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('C': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('B': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('C': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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[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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log
index 2bf2be1d34b..76a990f519b 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/loops.lazy.log
@@ -24,35 +24,130 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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 }
+}
+
+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[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 }
+}
+
+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@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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log
index 2e80f324e87..f7c0fc5735b 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/multilevelBlocks.lazy.log
@@ -24,39 +24,162 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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]
+    <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@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@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 }
+}
+
+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[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> = 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[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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log
index 05d83bd8328..b0a62a09201 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/realIteratorFoldl.lazy.log
@@ -42,59 +42,164 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('Iterator': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('Long': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('String': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('tailRecursive': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('rangeTo': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foldFunction': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foldl': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('hasNext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('tailRecursive': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foldFunction': Name@40) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('foldl': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('hasNext': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('next': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('equals': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldFunction': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('foldl': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('not': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('rangeTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('equals': Name@40) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('foldFunction': Name@41) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('foldl': Name@42) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('hasNext': Name@43) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('invoke': Name@44) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('iterator': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('next': Name@46) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('not': Name@47) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('plus': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('rangeTo': Name@49) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('foldFunction': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('foldl': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('hasNext': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('foldFunction': Name@40) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('foldl': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('hasNext': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('next': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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@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 }
+}
+
+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[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> = 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[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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log
index 3bd78af36ad..3172e882561 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/realStringEscape.lazy.log
@@ -8,71 +8,63 @@ LazyJavaClassDescriptor@3['AbstractStringBuilder'] {
     functions('append': Name@5) = ArrayList@6[13] { JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], JavaMethodDescriptor@9['append'], ... } // through LazyJavaClassMemberScope@10
     functions('toString': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['toString'] } // through LazyJavaClassMemberScope@10
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@20['Appendable'] {
-    defaultType = JetTypeImpl@21['Appendable']
-    functions('append': Name@22) = ArrayList@23[3] { JavaMethodDescriptor@24['append'], JavaMethodDescriptor@25['append'], JavaMethodDescriptor@26['append'] } // through LazyJavaClassMemberScope@27
-    functions('toString': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['toString'] } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@27
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@27
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+LazyJavaClassDescriptor@17['Appendable'] {
+    defaultType = JetTypeImpl@18['Appendable']
+    functions('append': Name@19) = ArrayList@20[3] { JavaMethodDescriptor@21['append'], JavaMethodDescriptor@22['append'], JavaMethodDescriptor@23['append'] } // through LazyJavaClassMemberScope@24
+    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@24
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
-LazyJavaClassDescriptor@34['Serializable'] {
-    defaultType = JetTypeImpl@35['Serializable']
-    functions('append': Name@5) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('toString': Name@11) = ArrayList@37[1] { DeserializedSimpleFunctionDescriptor@38['toString'] } // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@36
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+LazyJavaClassDescriptor@31['Serializable'] {
+    defaultType = JetTypeImpl@32['Serializable']
+    functions('append': Name@5) = EmptyList@33[empty] // through LazyJavaClassMemberScope@34
+    functions('toString': Name@11) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['toString'] } // through LazyJavaClassMemberScope@34
+    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@34
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
-LazyJavaClassDescriptor@41['StringBuffer'] {
+LazyJavaClassDescriptor@39['StringBuffer'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassDescriptor@43['StringBuilder'] {
-    constructors = ArrayList@44[4] { JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], ... } // through LazyJavaClassMemberScope@48
-    defaultType = JetTypeImpl@49['StringBuilder']
-    enumEntryIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@48
+LazyJavaClassDescriptor@41['StringBuilder'] {
+    constructors = ArrayList@42[4] { JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], ... } // through LazyJavaClassMemberScope@46
+    defaultType = JetTypeImpl@47['StringBuilder']
+    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@46
     functionTypeForSamInterface = null
-    functions('append': Name@15) = ArrayList@51[14] { JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], JavaMethodDescriptor@54['append'], ... } // through LazyJavaClassMemberScope@48
-    functions('toString': Name@17) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@48
-    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@48
-    nestedClasses('append': Name@15) = null // through LazyJavaClassMemberScope@48
-    nestedClasses('toString': Name@17) = null // through LazyJavaClassMemberScope@48
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@48
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@48
+    functions('append': Name@49) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@46
+    functions('toString': Name@54) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@46
+    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@46
+    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@46
+    nestedClasses('append': Name@49) = null // through LazyJavaClassMemberScope@46
+    nestedClasses('toString': Name@54) = null // through LazyJavaClassMemberScope@46
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@59['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
-LazyJavaClassTypeConstructor@19['AbstractStringBuilder'] {
+LazyJavaClassTypeConstructor@16['AbstractStringBuilder'] {
     parameters = ArrayList@61[empty]
     supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@33['Appendable'] {
+LazyJavaClassTypeConstructor@30['Appendable'] {
     parameters = ArrayList@65[empty]
     supertypes = ArrayList@66[1] { JetTypeImpl@67['Any'] }
 }
 
-LazyJavaClassTypeConstructor@40['Serializable'] {
+LazyJavaClassTypeConstructor@38['Serializable'] {
     parameters = ArrayList@68[empty]
     supertypes = ArrayList@69[1] { JetTypeImpl@67['Any'] }
 }
 
-LazyJavaClassTypeConstructor@42['StringBuffer'] {
+LazyJavaClassTypeConstructor@40['StringBuffer'] {
     parameters = ArrayList@70[empty]
     supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['AbstractStringBuilder'], LazyJavaClassifierType@73['Serializable'], LazyJavaClassifierType@74['CharSequence'] }
 }
@@ -86,244 +78,244 @@ LazyJavaClassifierType@77['AbstractStringBuilder'] {
     arguments = ArrayList@80[empty]
     classifier = JavaClassImpl@81['AbstractStringBuilder']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@82['AbstractStringBuilder'] {
     arguments = ArrayList@83[empty]
     classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@86['AbstractStringBuilder'] {
     arguments = ArrayList@87[empty]
     classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@89['AbstractStringBuilder'] {
     arguments = ArrayList@90[empty]
     classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@92['AbstractStringBuilder'] {
     arguments = ArrayList@93[empty]
     classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@95['AbstractStringBuilder'] {
     arguments = ArrayList@96[empty]
     classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@98['AbstractStringBuilder'] {
     arguments = ArrayList@99[empty]
     classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@101['AbstractStringBuilder'] {
     arguments = ArrayList@102[empty]
     classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@104['AbstractStringBuilder'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@107['AbstractStringBuilder'] {
     arguments = ArrayList@108[empty]
     classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@110['AbstractStringBuilder'] {
     arguments = ArrayList@111[empty]
     classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@113['AbstractStringBuilder'] {
     arguments = ArrayList@114[empty]
     classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@116['AbstractStringBuilder'] {
     arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@119['AbstractStringBuilder'] {
     arguments = ArrayList@120[empty]
     classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@122['AbstractStringBuilder'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@125['AbstractStringBuilder'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@127['AbstractStringBuilder'] {
     arguments = ArrayList@128[empty]
     classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@129['AbstractStringBuilder'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@131['AbstractStringBuilder'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@133['AbstractStringBuilder'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@135['AbstractStringBuilder'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@137['AbstractStringBuilder'] {
     arguments = ArrayList@138[empty]
     classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@139['AbstractStringBuilder'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@141['AbstractStringBuilder'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@143['AbstractStringBuilder'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@145['AbstractStringBuilder'] {
     arguments = ArrayList@146[empty]
     classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@147['AbstractStringBuilder'] {
     arguments = ArrayList@148[empty]
     classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@72['AbstractStringBuilder'] {
     arguments = ArrayList@149[empty]
     classifier = JavaClassImpl@150['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@63['Appendable'] {
     arguments = ArrayList@151[empty]
     classifier = JavaClassImpl@152['Appendable']
-    memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    memberScope = LazyJavaClassMemberScope@24
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@153['Appendable'] {
     arguments = ArrayList@154[empty]
     classifier = JavaClassImpl@155['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@156['Appendable'] {
     arguments = ArrayList@157[empty]
     classifier = JavaClassImpl@158['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@159['Appendable'] {
     arguments = ArrayList@160[empty]
     classifier = JavaClassImpl@161['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@162['Appendable'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaClassImpl@155['Appendable']
+    classifier = JavaClassImpl@161['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@164['Appendable'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaClassImpl@161['Appendable']
+    classifier = JavaClassImpl@158['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@166['Appendable'] {
     arguments = ArrayList@167[empty]
-    classifier = JavaClassImpl@158['Appendable']
+    classifier = JavaClassImpl@155['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@64['CharSequence'] {
@@ -391,49 +383,49 @@ LazyJavaClassifierType@192['CharSequence'] {
 
 LazyJavaClassifierType@195['CharSequence'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaClassImpl@176['CharSequence']
+    classifier = JavaClassImpl@191['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@197['CharSequence'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaClassImpl@194['CharSequence']
+    classifier = JavaClassImpl@179['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@199['CharSequence'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@185['CharSequence']
+    classifier = JavaClassImpl@182['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@201['CharSequence'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@188['CharSequence']
+    classifier = JavaClassImpl@185['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@203['CharSequence'] {
     arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@191['CharSequence']
+    classifier = JavaClassImpl@188['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@205['CharSequence'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@179['CharSequence']
+    classifier = JavaClassImpl@176['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@207['CharSequence'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@182['CharSequence']
+    classifier = JavaClassImpl@194['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -459,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
 }
@@ -489,13 +481,13 @@ LazyJavaClassifierType@225['Object'] {
 LazyJavaClassifierType@78['Serializable'] {
     arguments = ArrayList@227[empty]
     classifier = JavaClassImpl@228['Serializable']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+    memberScope = LazyJavaClassMemberScope@34
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
 LazyJavaClassifierType@73['Serializable'] {
     classifier = JavaClassImpl@229['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
 LazyJavaClassifierType@230['String'] {
@@ -535,35 +527,35 @@ LazyJavaClassifierType@243['String'] {
 
 LazyJavaClassifierType@246['String'] {
     arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@245['String']
+    classifier = JavaClassImpl@242['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@248['String'] {
     arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@236['String']
+    classifier = JavaClassImpl@232['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@250['String'] {
     arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@242['String']
+    classifier = JavaClassImpl@239['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@252['String'] {
     arguments = ArrayList@253[empty]
-    classifier = JavaClassImpl@239['String']
+    classifier = JavaClassImpl@245['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
 }
@@ -572,28 +564,28 @@ LazyJavaClassifierType@256['StringBuffer'] {
     arguments = ArrayList@257[empty]
     classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@259['StringBuffer'] {
     arguments = ArrayList@260[empty]
     classifier = JavaClassImpl@261['StringBuffer']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@262['StringBuffer'] {
     arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@261['StringBuffer']
+    classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    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@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@266['StringBuilder'] {
@@ -703,105 +695,105 @@ LazyJavaClassifierType@308['StringBuilder'] {
 
 LazyJavaClassifierType@311['StringBuilder'] {
     arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
+    classifier = JavaClassImpl@286['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@313['StringBuilder'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
+    classifier = JavaClassImpl@292['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@315['StringBuilder'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
+    classifier = JavaClassImpl@307['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@317['StringBuilder'] {
     arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
+    classifier = JavaClassImpl@289['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@319['StringBuilder'] {
     arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
+    classifier = JavaClassImpl@277['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@321['StringBuilder'] {
     arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
+    classifier = JavaClassImpl@298['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@323['StringBuilder'] {
     arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
+    classifier = JavaClassImpl@271['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@325['StringBuilder'] {
     arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
+    classifier = JavaClassImpl@301['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@327['StringBuilder'] {
     arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
+    classifier = JavaClassImpl@274['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@329['StringBuilder'] {
     arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
+    classifier = JavaClassImpl@268['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@331['StringBuilder'] {
     arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
+    classifier = JavaClassImpl@295['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@333['StringBuilder'] {
     arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
+    classifier = JavaClassImpl@280['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@335['StringBuilder'] {
     arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
+    classifier = JavaClassImpl@310['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@337['StringBuilder'] {
     arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
+    classifier = JavaClassImpl@283['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@339['StringBuilder'] {
     arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
+    classifier = JavaClassImpl@304['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -830,10 +822,10 @@ LazyJavaPackageFragmentProvider@341 {
     packageFragments('kotlin.tailRecursive': FqName@366) = null
     packageFragments('tailRecursive': FqName@367) = null
     topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@20['Appendable']
-    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@34['Serializable']
-    topLevelClasses(JavaClassImpl@261['StringBuffer']) = LazyJavaClassDescriptor@41['StringBuffer']
-    topLevelClasses(JavaClassImpl@368['StringBuilder']) = LazyJavaClassDescriptor@43['StringBuilder']
+    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@17['Appendable']
+    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
+    topLevelClasses(JavaClassImpl@261['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
+    topLevelClasses(JavaClassImpl@368['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
 LazyJavaPackageFragment@343['<root>'] {
@@ -841,52 +833,188 @@ LazyJavaPackageFragment@343['<root>'] {
     classes('Int': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@370
     classes('String': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@370
     classes('StringBuilder': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('equals': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('escape': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('escapeChar': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('get': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('length': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('plus': Name@379) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('tailRecursive': Name@380) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    deserializedPackageScope = Empty@381 // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('StringBuilder': Name@382) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('equals': Name@374) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('escape': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('escapeChar': Name@376) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('get': Name@377) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('plus': Name@379) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    memberIndex = computeMemberIndex$1@383 // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('escape': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('escapeChar': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('get': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('length': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('tailRecursive': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@370
+    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('StringBuilder': Name@380) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('escape': Name@374) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('escapeChar': Name@375) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('get': Name@376) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    memberIndex = computeMemberIndex$1@381 // through LazyPackageFragmentScopeForJavaPackage@370
 }
 
 LazyJavaPackageFragment@349['java'] {
-    classes('lang': Name@384) = null // through LazyPackageFragmentScopeForJavaPackage@385
-    deserializedPackageScope = Empty@381 // through LazyPackageFragmentScopeForJavaPackage@385
-    functions('lang': Name@386) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@385
-    memberIndex = computeMemberIndex$1@387 // through LazyPackageFragmentScopeForJavaPackage@385
+    classes('lang': Name@382) = null // through LazyPackageFragmentScopeForJavaPackage@383
+    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@383
+    functions('lang': Name@384) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@383
+    memberIndex = computeMemberIndex$1@385 // through LazyPackageFragmentScopeForJavaPackage@383
 }
 
 LazyJavaPackageFragment@353['lang'] {
-    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@43['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('equals': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('escape': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('escapeChar': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('get': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('length': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('plus': Name@379) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    deserializedPackageScope = Empty@381 // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('StringBuilder': Name@382) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('equals': Name@374) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('escape': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('escapeChar': Name@376) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('get': Name@377) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('plus': Name@379) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    memberIndex = computeMemberIndex$1@389 // through LazyPackageFragmentScopeForJavaPackage@388
+    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('escape': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('escapeChar': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('get': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    classes('length': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@386
+    deserializedPackageScope = Empty@379 // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('StringBuilder': Name@380) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('escape': Name@374) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('escapeChar': Name@375) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    functions('get': Name@376) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@386
+    memberIndex = computeMemberIndex$1@387 // through LazyPackageFragmentScopeForJavaPackage@386
+}
+
+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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@33[empty]
+}
+
+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@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[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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log
index 9f819dd59f2..22deaf738d8 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/realStringRepeat.lazy.log
@@ -8,71 +8,63 @@ LazyJavaClassDescriptor@3['AbstractStringBuilder'] {
     functions('append': Name@5) = ArrayList@6[13] { JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], JavaMethodDescriptor@9['append'], ... } // through LazyJavaClassMemberScope@10
     functions('toString': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['toString'] } // through LazyJavaClassMemberScope@10
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@20['Appendable'] {
-    defaultType = JetTypeImpl@21['Appendable']
-    functions('append': Name@22) = ArrayList@23[3] { JavaMethodDescriptor@24['append'], JavaMethodDescriptor@25['append'], JavaMethodDescriptor@26['append'] } // through LazyJavaClassMemberScope@27
-    functions('toString': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['toString'] } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@27
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@27
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+LazyJavaClassDescriptor@17['Appendable'] {
+    defaultType = JetTypeImpl@18['Appendable']
+    functions('append': Name@19) = ArrayList@20[3] { JavaMethodDescriptor@21['append'], JavaMethodDescriptor@22['append'], JavaMethodDescriptor@23['append'] } // through LazyJavaClassMemberScope@24
+    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@24
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
-LazyJavaClassDescriptor@34['Serializable'] {
-    defaultType = JetTypeImpl@35['Serializable']
-    functions('append': Name@5) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('toString': Name@11) = ArrayList@37[1] { DeserializedSimpleFunctionDescriptor@38['toString'] } // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@36
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+LazyJavaClassDescriptor@31['Serializable'] {
+    defaultType = JetTypeImpl@32['Serializable']
+    functions('append': Name@5) = EmptyList@33[empty] // through LazyJavaClassMemberScope@34
+    functions('toString': Name@11) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['toString'] } // through LazyJavaClassMemberScope@34
+    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@34
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
-LazyJavaClassDescriptor@41['StringBuffer'] {
+LazyJavaClassDescriptor@39['StringBuffer'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassDescriptor@43['StringBuilder'] {
-    constructors = ArrayList@44[4] { JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], ... } // through LazyJavaClassMemberScope@48
-    defaultType = JetTypeImpl@49['StringBuilder']
-    enumEntryIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@48
+LazyJavaClassDescriptor@41['StringBuilder'] {
+    constructors = ArrayList@42[4] { JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], ... } // through LazyJavaClassMemberScope@46
+    defaultType = JetTypeImpl@47['StringBuilder']
+    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@46
     functionTypeForSamInterface = null
-    functions('append': Name@15) = ArrayList@51[14] { JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], JavaMethodDescriptor@54['append'], ... } // through LazyJavaClassMemberScope@48
-    functions('toString': Name@17) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@48
-    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@48
-    nestedClasses('append': Name@15) = null // through LazyJavaClassMemberScope@48
-    nestedClasses('toString': Name@17) = null // through LazyJavaClassMemberScope@48
-    properties('append': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@48
-    properties('toString': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@48
+    functions('append': Name@49) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@46
+    functions('toString': Name@54) = ArrayList@55[1] { JavaMethodDescriptor@56['toString'] } // through LazyJavaClassMemberScope@46
+    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@46
+    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@46
+    nestedClasses('append': Name@49) = null // through LazyJavaClassMemberScope@46
+    nestedClasses('toString': Name@54) = null // through LazyJavaClassMemberScope@46
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@59['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
-LazyJavaClassTypeConstructor@19['AbstractStringBuilder'] {
+LazyJavaClassTypeConstructor@16['AbstractStringBuilder'] {
     parameters = ArrayList@61[empty]
     supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['Appendable'], LazyJavaClassifierType@64['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@33['Appendable'] {
+LazyJavaClassTypeConstructor@30['Appendable'] {
     parameters = ArrayList@65[empty]
     supertypes = ArrayList@66[1] { JetTypeImpl@67['Any'] }
 }
 
-LazyJavaClassTypeConstructor@40['Serializable'] {
+LazyJavaClassTypeConstructor@38['Serializable'] {
     parameters = ArrayList@68[empty]
     supertypes = ArrayList@69[1] { JetTypeImpl@67['Any'] }
 }
 
-LazyJavaClassTypeConstructor@42['StringBuffer'] {
+LazyJavaClassTypeConstructor@40['StringBuffer'] {
     parameters = ArrayList@70[empty]
     supertypes = ArrayList@71[3] { LazyJavaClassifierType@72['AbstractStringBuilder'], LazyJavaClassifierType@73['Serializable'], LazyJavaClassifierType@74['CharSequence'] }
 }
@@ -86,254 +78,254 @@ LazyJavaClassifierType@77['AbstractStringBuilder'] {
     arguments = ArrayList@80[empty]
     classifier = JavaClassImpl@81['AbstractStringBuilder']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@82['AbstractStringBuilder'] {
     arguments = ArrayList@83[empty]
     classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@86['AbstractStringBuilder'] {
     arguments = ArrayList@87[empty]
     classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@89['AbstractStringBuilder'] {
     arguments = ArrayList@90[empty]
     classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@92['AbstractStringBuilder'] {
     arguments = ArrayList@93[empty]
     classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@95['AbstractStringBuilder'] {
     arguments = ArrayList@96[empty]
     classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@98['AbstractStringBuilder'] {
     arguments = ArrayList@99[empty]
     classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@101['AbstractStringBuilder'] {
     arguments = ArrayList@102[empty]
     classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@104['AbstractStringBuilder'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@107['AbstractStringBuilder'] {
     arguments = ArrayList@108[empty]
     classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@110['AbstractStringBuilder'] {
     arguments = ArrayList@111[empty]
     classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@113['AbstractStringBuilder'] {
     arguments = ArrayList@114[empty]
     classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@116['AbstractStringBuilder'] {
     arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@119['AbstractStringBuilder'] {
     arguments = ArrayList@120[empty]
     classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@122['AbstractStringBuilder'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@125['AbstractStringBuilder'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@97['AbstractStringBuilder']
+    classifier = JavaClassImpl@88['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@127['AbstractStringBuilder'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@129['AbstractStringBuilder'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@112['AbstractStringBuilder']
+    classifier = JavaClassImpl@84['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@131['AbstractStringBuilder'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@115['AbstractStringBuilder']
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@133['AbstractStringBuilder'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@135['AbstractStringBuilder'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@137['AbstractStringBuilder'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@139['AbstractStringBuilder'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@141['AbstractStringBuilder'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
+    classifier = JavaClassImpl@112['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@143['AbstractStringBuilder'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    classifier = JavaClassImpl@97['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@145['AbstractStringBuilder'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
+    classifier = JavaClassImpl@115['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@147['AbstractStringBuilder'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@84['AbstractStringBuilder']
+    classifier = JavaClassImpl@91['AbstractStringBuilder']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@72['AbstractStringBuilder'] {
     arguments = ArrayList@149[empty]
     classifier = JavaClassImpl@150['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@63['Appendable'] {
     arguments = ArrayList@151[empty]
     classifier = JavaClassImpl@152['Appendable']
-    memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    memberScope = LazyJavaClassMemberScope@24
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@153['Appendable'] {
     arguments = ArrayList@154[empty]
     classifier = JavaClassImpl@155['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@156['Appendable'] {
     arguments = ArrayList@157[empty]
     classifier = JavaClassImpl@158['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@159['Appendable'] {
     arguments = ArrayList@160[empty]
     classifier = JavaClassImpl@161['Appendable']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@162['Appendable'] {
     arguments = ArrayList@163[empty]
     classifier = JavaClassImpl@161['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@164['Appendable'] {
     arguments = ArrayList@165[empty]
     classifier = JavaClassImpl@158['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
 LazyJavaClassifierType@166['Appendable'] {
     arguments = ArrayList@167[empty]
     classifier = JavaClassImpl@155['Appendable']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@33['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
 }
 
-LazyJavaClassifierType@64['CharSequence'] {
+LazyJavaClassifierType@79['CharSequence'] {
     arguments = ArrayList@168[empty]
     classifier = JavaClassImpl@169['CharSequence']
     memberScope = DeserializedClassMemberScope@170
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
-LazyJavaClassifierType@79['CharSequence'] {
+LazyJavaClassifierType@64['CharSequence'] {
     arguments = ArrayList@172[empty]
     classifier = JavaClassImpl@173['CharSequence']
     memberScope = DeserializedClassMemberScope@170
@@ -398,42 +390,42 @@ LazyJavaClassifierType@195['CharSequence'] {
 
 LazyJavaClassifierType@197['CharSequence'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaClassImpl@185['CharSequence']
+    classifier = JavaClassImpl@194['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@199['CharSequence'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@194['CharSequence']
+    classifier = JavaClassImpl@179['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@201['CharSequence'] {
     arguments = ArrayList@202[empty]
-    classifier = JavaClassImpl@179['CharSequence']
+    classifier = JavaClassImpl@185['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@203['CharSequence'] {
     arguments = ArrayList@204[empty]
-    classifier = JavaClassImpl@191['CharSequence']
+    classifier = JavaClassImpl@176['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@205['CharSequence'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaClassImpl@188['CharSequence']
+    classifier = JavaClassImpl@191['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
 
 LazyJavaClassifierType@207['CharSequence'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaClassImpl@176['CharSequence']
+    classifier = JavaClassImpl@188['CharSequence']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@171
 }
@@ -489,13 +481,13 @@ LazyJavaClassifierType@225['Object'] {
 LazyJavaClassifierType@78['Serializable'] {
     arguments = ArrayList@227[empty]
     classifier = JavaClassImpl@228['Serializable']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+    memberScope = LazyJavaClassMemberScope@34
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
 LazyJavaClassifierType@73['Serializable'] {
     classifier = JavaClassImpl@229['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
 LazyJavaClassifierType@230['String'] {
@@ -535,28 +527,28 @@ LazyJavaClassifierType@243['String'] {
 
 LazyJavaClassifierType@246['String'] {
     arguments = ArrayList@247[empty]
-    classifier = JavaClassImpl@236['String']
+    classifier = JavaClassImpl@242['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@248['String'] {
     arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@239['String']
+    classifier = JavaClassImpl@236['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@250['String'] {
     arguments = ArrayList@251[empty]
-    classifier = JavaClassImpl@242['String']
+    classifier = JavaClassImpl@245['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
 
 LazyJavaClassifierType@252['String'] {
     arguments = ArrayList@253[empty]
-    classifier = JavaClassImpl@245['String']
+    classifier = JavaClassImpl@239['String']
     nullable = 'true': Boolean@124
     typeConstructor = DeserializedClassTypeConstructor@233
 }
@@ -572,28 +564,28 @@ LazyJavaClassifierType@256['StringBuffer'] {
     arguments = ArrayList@257[empty]
     classifier = JavaClassImpl@258['StringBuffer']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@259['StringBuffer'] {
     arguments = ArrayList@260[empty]
     classifier = JavaClassImpl@261['StringBuffer']
     nullable = 'false': Boolean@85
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@262['StringBuffer'] {
     arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@258['StringBuffer']
+    classifier = JavaClassImpl@261['StringBuffer']
     nullable = 'true': Boolean@124
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    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@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
 LazyJavaClassifierType@266['StringBuilder'] {
@@ -703,105 +695,105 @@ LazyJavaClassifierType@308['StringBuilder'] {
 
 LazyJavaClassifierType@311['StringBuilder'] {
     arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@271['StringBuilder']
+    classifier = JavaClassImpl@274['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@313['StringBuilder'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
+    classifier = JavaClassImpl@283['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@315['StringBuilder'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
+    classifier = JavaClassImpl@304['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@317['StringBuilder'] {
     arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
+    classifier = JavaClassImpl@286['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@319['StringBuilder'] {
     arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
+    classifier = JavaClassImpl@301['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@321['StringBuilder'] {
     arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
+    classifier = JavaClassImpl@298['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@323['StringBuilder'] {
     arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@268['StringBuilder']
+    classifier = JavaClassImpl@271['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@325['StringBuilder'] {
     arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
+    classifier = JavaClassImpl@307['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@286['StringBuilder']
+    classifier = JavaClassImpl@280['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@331['StringBuilder'] {
     arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
+    classifier = JavaClassImpl@268['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@333['StringBuilder'] {
     arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
+    classifier = JavaClassImpl@310['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@335['StringBuilder'] {
     arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
+    classifier = JavaClassImpl@292['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@337['StringBuilder'] {
     arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
+    classifier = JavaClassImpl@277['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
 
 LazyJavaClassifierType@339['StringBuilder'] {
     arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
+    classifier = JavaClassImpl@289['StringBuilder']
     nullable = 'true': Boolean@124
     typeConstructor = LazyJavaClassTypeConstructor@60['StringBuilder']
 }
@@ -827,52 +819,161 @@ LazyJavaPackageFragmentProvider@341 {
     packageFragments('kotlin.tailRecursive': FqName@363) = null
     packageFragments('tailRecursive': FqName@364) = null
     topLevelClasses(JavaClassImpl@81['AbstractStringBuilder']) = LazyJavaClassDescriptor@3['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@20['Appendable']
-    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@34['Serializable']
-    topLevelClasses(JavaClassImpl@258['StringBuffer']) = LazyJavaClassDescriptor@41['StringBuffer']
-    topLevelClasses(JavaClassImpl@365['StringBuilder']) = LazyJavaClassDescriptor@43['StringBuilder']
+    topLevelClasses(JavaClassImpl@152['Appendable']) = LazyJavaClassDescriptor@17['Appendable']
+    topLevelClasses(JavaClassImpl@228['Serializable']) = LazyJavaClassDescriptor@31['Serializable']
+    topLevelClasses(JavaClassImpl@261['StringBuffer']) = LazyJavaClassDescriptor@39['StringBuffer']
+    topLevelClasses(JavaClassImpl@365['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
 LazyJavaPackageFragment@343['<root>'] {
     classes('Int': Name@366) = null // through LazyPackageFragmentScopeForJavaPackage@367
     classes('String': Name@368) = null // through LazyPackageFragmentScopeForJavaPackage@367
     classes('StringBuilder': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('equals': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('minus': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('repeat': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('tailRecursive': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@367
-    deserializedPackageScope = Empty@374 // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('StringBuilder': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('equals': Name@370) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('minus': Name@371) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('repeat': Name@372) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@367
-    memberIndex = computeMemberIndex$1@376 // through LazyPackageFragmentScopeForJavaPackage@367
+    classes('repeat': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@367
+    classes('tailRecursive': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@367
+    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@367
+    functions('StringBuilder': Name@373) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@367
+    functions('repeat': Name@370) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@367
+    memberIndex = computeMemberIndex$1@374 // through LazyPackageFragmentScopeForJavaPackage@367
 }
 
 LazyJavaPackageFragment@348['java'] {
-    classes('lang': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@378
-    deserializedPackageScope = Empty@374 // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('lang': Name@379) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    memberIndex = computeMemberIndex$1@380 // through LazyPackageFragmentScopeForJavaPackage@378
+    classes('lang': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@376
+    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@376
+    functions('lang': Name@377) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@376
+    memberIndex = computeMemberIndex$1@378 // through LazyPackageFragmentScopeForJavaPackage@376
 }
 
 LazyJavaPackageFragment@352['lang'] {
-    classes('StringBuilder': Name@369) = LazyJavaClassDescriptor@43['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('append': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('equals': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('minus': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('repeat': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    classes('toString': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@381
-    deserializedPackageScope = Empty@374 // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('StringBuilder': Name@375) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('append': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('equals': Name@370) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('minus': Name@371) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('repeat': Name@372) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    functions('toString': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@381
-    memberIndex = computeMemberIndex$1@382 // through LazyPackageFragmentScopeForJavaPackage@381
+    classes('StringBuilder': Name@369) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@379
+    classes('repeat': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@379
+    deserializedPackageScope = Empty@372 // through LazyPackageFragmentScopeForJavaPackage@379
+    functions('StringBuilder': Name@373) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@379
+    functions('repeat': Name@370) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@379
+    memberIndex = computeMemberIndex$1@380 // through LazyPackageFragmentScopeForJavaPackage@379
+}
+
+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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
+}
+
+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@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
+}
+
+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@424 {
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
+}
+
+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@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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log
index 29fdaf9865a..7b9d8fb8be3 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLambda.lazy.log
@@ -48,3 +48,35 @@ LazyJavaPackageFragment@11['lang'] {
     functions('foo': Name@26) = 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@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]
+    <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]
+    <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 }
+}
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
index 54ad5e1e412..8eb267341b9 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/recursiveCallInLocalFunction.lazy.log
@@ -40,3 +40,26 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log
index 2930e96c28b..3d5ed9af623 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/recursiveInnerFunction.lazy.log
@@ -24,35 +24,71 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('g3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('g3': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('g3': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('g3': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('g3': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('g3': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('test': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('g3': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('test': 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@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@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 }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log
index 2e80f324e87..618a2cc3a40 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnIf.lazy.log
@@ -24,39 +24,139 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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@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 }
+}
+
+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 }
+}
+
+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[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { 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, ... }
+}
+
+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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log
index 773b9a40ea7..21d505b2887 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInCatch.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@41['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -131,34 +131,88 @@ LazyJavaPackageFragment@52['<root>'] {
     classes('Exception': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('minus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('tailRecursive': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('test': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('equals': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('minus': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('test': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('tailRecursive': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('Exception': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('test': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@73) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('minus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('test': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('equals': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('minus': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('test': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('Exception': Name@73) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('test': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('Exception': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('test': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+}
+
+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]
+    <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@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 }
+}
+
+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> = 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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log
index 315a02beed3..73733e30dec 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInFinally.lazy.log
@@ -24,31 +24,76 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 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@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('test': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('test': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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@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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log
index 2bf2be1d34b..06fece897a3 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInIfInFinally.lazy.log
@@ -24,35 +24,91 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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@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 }
+}
+
+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[7] { ResolutionCandidate@74, ResolutionCandidate@75, ResolutionCandidate@76, ... }
+    <name not found> = ArrayList@77[7] { 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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log
index c82e75bd7af..1f2bf4f295d 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInParentheses.lazy.log
@@ -24,31 +24,66 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 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@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { 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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log
index 3d6cc25188d..795ce8974e9 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/returnInTry.lazy.log
@@ -28,31 +28,81 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Throwable': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('test': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('test': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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@12['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('test': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('minus': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('test': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('test': Name@30) = 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@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]
+    <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@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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log
index 2e80f324e87..618a2cc3a40 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/simpleBlock.lazy.log
@@ -24,39 +24,139 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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@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 }
+}
+
+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 }
+}
+
+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[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { 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, ... }
+}
+
+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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log
index 2e80f324e87..3ee3286a4a4 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturn.lazy.log
@@ -24,39 +24,110 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('minus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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 }
+}
+
+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[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { 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@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@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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log
index 01e17e16745..8bde06b5304 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/simpleReturnWithElse.lazy.log
@@ -24,35 +24,129 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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@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 }
+}
+
+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 }
+}
+
+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[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { 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> = 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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log
index ece33914813..b22dfdc7e54 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/sum.lazy.log
@@ -28,43 +28,128 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('Long': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('sum': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('tailRecursive': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('toLong': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('minus': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('sum': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('toLong': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('sum': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('sum': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('sum': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toLong': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('minus': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('sum': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toLong': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('sum': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('sum': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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> = 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 }
+}
+
+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 }
+}
+
+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> = 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[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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 8e3a0554dde..9d065af37a2 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/tailCallInBlockInParentheses.lazy.log
@@ -25,31 +25,78 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('compareTo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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('compareTo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('compareTo': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@26) = 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@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]
+    <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@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 }
+}
+
+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[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+    <name not found> = ArrayList@70[7] { ResolutionCandidate@67, ResolutionCandidate@68, ResolutionCandidate@69, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log
index c82e75bd7af..1f2bf4f295d 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/tailCallInParentheses.lazy.log
@@ -24,31 +24,66 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 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@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('minus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('minus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('foo': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { 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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log
index 1196586d517..d67b7e222c7 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/tailRecursionInFinally.lazy.log
@@ -48,28 +48,75 @@ LazyJavaPackageFragment@13['<root>'] {
     classes('Exception': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('Unit': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tailRecursive': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('not': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('test': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('tailRecursive': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('test': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('test': Name@43) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('lang': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    classes('Exception': Name@39) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('not': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('test': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('not': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('test': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Exception': Name@39) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('test': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('test': Name@43) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+}
+
+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]
+    <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 }
+    <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@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@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/codegen/box/functions/tailRecursion/thisReferences.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log
index 3c7bfe446e9..cb97da3c136 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/thisReferences.lazy.log
@@ -38,42 +38,138 @@ LazyJavaPackageFragment@11['<root>'] {
     classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('minus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('tailRecursive': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('A': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('compareTo': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f1': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f2': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f3': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('minus': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('f2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('tailRecursive': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('A': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('f2': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('compareTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f1': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f2': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('f3': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('A': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('compareTo': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('f1': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('f2': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('f3': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('minus': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('A': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('f2': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('A': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('f2': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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> = 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 }
+}
+
+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[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> = 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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log
index b2e67cb4316..41c5d2b2d58 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/unitBlocks.lazy.log
@@ -28,35 +28,197 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Unit': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('test': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('test': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    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@12['lang'] {
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('minus': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('test': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('test': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('test': Name@30) = 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@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]
+    <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 }
+    <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 {
+    <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]
+    <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@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[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 }
+}
+
+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> = 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 }
+}
+
+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[7] { ResolutionCandidate@138, ResolutionCandidate@139, ResolutionCandidate@140, ... }
+    <name not found> = ArrayList@141[7] { 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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log
index 0934d9b71b2..b718253cf43 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithCondition.lazy.log
@@ -24,35 +24,100 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('withWhen': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('withWhen': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('withWhen': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('withWhen': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('withWhen': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('withWhen': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('withWhen': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('withWhen': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log
index b19bd043a34..b5709719718 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithInRange.lazy.log
@@ -28,43 +28,177 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('tailRecursive': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('rangeTo': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('withWhen': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('tailRecursive': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('withWhen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('withWhen': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    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@12['lang'] {
-    classes('contains': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('rangeTo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('withWhen': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('contains': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('equals': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('minus': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('plus': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('rangeTo': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('withWhen': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('withWhen': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('withWhen': Name@30) = 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@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]
+    <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 }
+    <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 {
+    <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]
+    <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@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[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 }
+}
+
+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> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { 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, ... }
+}
+
+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@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@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, ... }
 }
diff --git a/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log b/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log
index fd40c17e877..eb7281fbd91 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithIs.lazy.log
@@ -140,34 +140,146 @@ LazyJavaPackageFragment@56['<root>'] {
     classes('Int': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('Number': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('String': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('equals': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('minus': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('tailRecursive': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('withWhen': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('IllegalStateException': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('equals': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('minus': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('withWhen': Name@89) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('tailRecursive': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('withWhen': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('IllegalStateException': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('withWhen': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
 LazyJavaPackageFragment@64['lang'] {
-    classes('IllegalStateException': Name@82) = LazyJavaClassDescriptor@5['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('equals': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('minus': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('withWhen': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('IllegalStateException': Name@82) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('equals': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('minus': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('withWhen': Name@89) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('IllegalStateException': Name@82) = LazyJavaClassDescriptor@5['IllegalStateException'] // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('withWhen': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('IllegalStateException': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('withWhen': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+}
+
+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]
+    <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 }
+    <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@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@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 }
+}
+
+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> = 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[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <name not found> = ArrayList@170[4] { ResolutionCandidate@167, ResolutionCandidate@168, ResolutionCandidate@169, ... }
+    <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 850f9380ce8..0800d6e888d 100644
--- a/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log
+++ b/compiler/testData/codegen/box/functions/tailRecursion/whenWithoutCondition.lazy.log
@@ -24,35 +24,129 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('tailRecursive': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('withWhen2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('withWhen2': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('tailRecursive': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('withWhen2': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('withWhen2': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('minus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('withWhen2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('withWhen2': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('withWhen2': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('withWhen2': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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@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 }
+}
+
+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 }
+}
+
+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[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { 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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/Abstract.lazy.log b/compiler/testData/diagnostics/tests/Abstract.lazy.log
index f9e56b2e5d8..64d2874e96e 100644
--- a/compiler/testData/diagnostics/tests/Abstract.lazy.log
+++ b/compiler/testData/diagnostics/tests/Abstract.lazy.log
@@ -86,3 +86,116 @@ LazyJavaPackageFragment@43['lang'] {
     functions('B3': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
 }
+
+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]
+    <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 }
+    <name not found> = EmptyList@61[empty]
+    <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]
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@61[empty]
+    <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]
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+    <name not found> = EmptyList@61[empty]
+    <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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
index adef01a86a0..6f48b077786 100644
--- a/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/AbstractInAbstractClass.lazy.log
@@ -36,3 +36,93 @@ LazyJavaPackageFragment@15['lang'] {
     classes('i': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <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@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]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@25[empty]
+    <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]
+    <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@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <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 e36fb8ac750..260507481cb 100644
--- a/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/AbstractInClass.lazy.log
@@ -36,3 +36,93 @@ LazyJavaPackageFragment@15['lang'] {
     classes('i': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <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@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]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@25[empty]
+    <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]
+    <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@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <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 38a19813db5..809c50ebc64 100644
--- a/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/AbstractInTrait.lazy.log
@@ -29,3 +29,93 @@ LazyJavaPackageFragment@10['lang'] {
     classes('i': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+    <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> = 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]
+    <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]
+}
+
+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]
+    <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@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@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 be1fcca1544..e0d1f57c65a 100644
--- a/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/AnonymousInitializerVarAndConstructor.lazy.log
@@ -32,3 +32,15 @@ LazyJavaPackageFragment@10['lang'] {
     classes('c': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log b/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
index eb0ea95dffd..ccb40f08636 100644
--- a/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
+++ b/compiler/testData/diagnostics/tests/AnonymousInitializers.lazy.log
@@ -49,3 +49,223 @@ LazyJavaPackageFragment@11['lang'] {
     functions('b': Name@31) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 cf4ed691da2..45a16f6d84d 100644
--- a/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
+++ b/compiler/testData/diagnostics/tests/AutoCreatedIt.lazy.log
@@ -34,50 +34,322 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('bar1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('bar2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('it': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('on': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('to': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('URI': Name@33) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar1': Name@35) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar2': Name@36) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@37) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('it': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('on': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('to': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('it': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('on': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('to': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('URI': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('bar': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('bar1': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('bar2': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('it': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('on': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('to': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('URI': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('bar2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('it': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('on': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('plus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('to': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('URI': Name@33) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('bar': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('bar1': Name@35) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('bar2': Name@36) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('equals': Name@37) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('it': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('on': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('plus': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('to': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('URI': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('bar1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('bar2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('it': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('on': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('to': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('URI': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('bar': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('bar1': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('bar2': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('it': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('on': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('to': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+}
+
+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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <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@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]
+    <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 }
+    <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]
+}
+
+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]
+    <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 }
+    <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]
+}
+
+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@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@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@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[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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@158 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@159 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 c2bb88f6171..016dc8d1998 100644
--- a/compiler/testData/diagnostics/tests/Basic.lazy.log
+++ b/compiler/testData/diagnostics/tests/Basic.lazy.log
@@ -55,3 +55,241 @@ LazyJavaPackageFragment@10['lang'] {
     functions('xx': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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> = 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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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 eabbc5c5634..370aecd8e27 100644
--- a/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
+++ b/compiler/testData/diagnostics/tests/BinaryCallsOnNullableValues.lazy.log
@@ -72,3 +72,351 @@ LazyJavaPackageFragment@13['lang'] {
     functions('rangeTo': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
 }
+
+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> = EmptyList@38[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 }
+    <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> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@69 {
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@71 }
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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]
+    <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@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@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 {
+    <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 }
+}
+
+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 }
+}
+
+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> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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, ... }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <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 52659393346..0dd15fa6028 100644
--- a/compiler/testData/diagnostics/tests/Bounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/Bounds.lazy.log
@@ -101,3 +101,142 @@ LazyJavaPackageFragment@37['lang'] {
     functions('foo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }
+
+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]
+    <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@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]
+    <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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+    <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 ae8825034d6..7c459a171ca 100644
--- a/compiler/testData/diagnostics/tests/BreakContinue.lazy.log
+++ b/compiler/testData/diagnostics/tests/BreakContinue.lazy.log
@@ -27,36 +27,397 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('compareTo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('hasNext': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('iterator': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('next': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('compareTo': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('hasNext': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('iterator': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('next': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('compareTo': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('hasNext': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('iterator': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('next': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('compareTo': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('hasNext': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('iterator': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('next': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('compareTo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('compareTo': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+}
+
+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@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> = 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]
+    <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 }
+    <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@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> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <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]
+}
+
+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@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 }
+    <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@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@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@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[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 }
+}
+
+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 }
+}
+
+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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/Builders.lazy.log b/compiler/testData/diagnostics/tests/Builders.lazy.log
index 248ad2a71c0..a22059b672c 100644
--- a/compiler/testData/diagnostics/tests/Builders.lazy.log
+++ b/compiler/testData/diagnostics/tests/Builders.lazy.log
@@ -17,2484 +17,3628 @@ LazyJavaClassDescriptor@12['AbstractCollection'] {
     functions('add': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
     functions('iterator': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['iterator'] } // through LazyJavaClassMemberScope@17
     memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@17
-    properties('add': Name@22) = EmptyList@23[empty] // through LazyJavaClassMemberScope@17
-    properties('iterator': Name@24) = EmptyList@23[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@26['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@27['AbstractList'] {
-    defaultType = JetTypeImpl@28['AbstractList<1>']
-    functions('add': Name@29) = ArrayList@30[2] { JavaMethodDescriptor@31['add'], JavaMethodDescriptor@32['add'] } // through LazyJavaClassMemberScope@33
-    functions('iterator': Name@34) = ArrayList@35[1] { JavaMethodDescriptor@36['iterator'] } // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@33
-    properties('add': Name@22) = EmptyList@23[empty] // through LazyJavaClassMemberScope@33
-    properties('iterator': Name@24) = EmptyList@23[empty] // through LazyJavaClassMemberScope@33
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['AbstractList']
+LazyJavaClassDescriptor@24['AbstractList'] {
+    defaultType = JetTypeImpl@25['AbstractList<1>']
+    functions('add': Name@26) = ArrayList@27[2] { JavaMethodDescriptor@28['add'], JavaMethodDescriptor@29['add'] } // through LazyJavaClassMemberScope@30
+    functions('iterator': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['iterator'] } // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@30
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
 }
 
-LazyJavaClassDescriptor@40['AbstractMap'] {
-    defaultType = JetTypeImpl@41['AbstractMap<2>']
-    functions('get': Name@42) = ArrayList@43[1] { JavaMethodDescriptor@44['get'] } // through LazyJavaClassMemberScope@45
-    functions('keySet': Name@46) = ArrayList@47[1] { JavaMethodDescriptor@48['keySet'] } // through LazyJavaClassMemberScope@45
-    functions('put': Name@49) = ArrayList@50[1] { JavaMethodDescriptor@51['put'] } // through LazyJavaClassMemberScope@45
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@45
-    properties('get': Name@53) = EmptyList@23[empty] // through LazyJavaClassMemberScope@45
-    properties('keySet': Name@54) = ArrayList@55[1] { JavaPropertyDescriptor@56['keySet'] } // through LazyJavaClassMemberScope@45
-    properties('put': Name@57) = EmptyList@23[empty] // through LazyJavaClassMemberScope@45
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@58['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractMap']
+LazyJavaClassDescriptor@37['AbstractMap'] {
+    defaultType = JetTypeImpl@38['AbstractMap<2>']
+    functions('get': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@41['get'] } // through LazyJavaClassMemberScope@42
+    functions('keySet': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@45['keySet'] } // through LazyJavaClassMemberScope@42
+    functions('put': Name@46) = ArrayList@47[1] { JavaMethodDescriptor@48['put'] } // through LazyJavaClassMemberScope@42
+    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@42
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@50['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractMap']
 }
 
-LazyJavaClassDescriptor@60['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@61['AbstractStringBuilder']
-    functions('append': Name@62) = ArrayList@63[13] { JavaMethodDescriptor@64['append'], JavaMethodDescriptor@65['append'], JavaMethodDescriptor@66['append'], ... } // through LazyJavaClassMemberScope@67
-    functions('toString': Name@68) = ArrayList@69[1] { JavaMethodDescriptor@70['toString'] } // through LazyJavaClassMemberScope@67
-    memberIndex = computeMemberIndex$1@71 // through LazyJavaClassMemberScope@67
-    properties('append': Name@72) = EmptyList@23[empty] // through LazyJavaClassMemberScope@67
-    properties('toString': Name@73) = EmptyList@23[empty] // through LazyJavaClassMemberScope@67
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@74['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassDescriptor@52['AbstractStringBuilder'] {
+    defaultType = JetTypeImpl@53['AbstractStringBuilder']
+    functions('append': Name@54) = ArrayList@55[13] { JavaMethodDescriptor@56['append'], JavaMethodDescriptor@57['append'], JavaMethodDescriptor@58['append'], ... } // through LazyJavaClassMemberScope@59
+    functions('toString': Name@60) = ArrayList@61[1] { JavaMethodDescriptor@62['toString'] } // through LazyJavaClassMemberScope@59
+    memberIndex = computeMemberIndex$1@63 // through LazyJavaClassMemberScope@59
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@64['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@76['Appendable'] {
-    defaultType = JetTypeImpl@77['Appendable']
-    functions('append': Name@78) = ArrayList@79[3] { JavaMethodDescriptor@80['append'], JavaMethodDescriptor@81['append'], JavaMethodDescriptor@82['append'] } // through LazyJavaClassMemberScope@83
-    functions('print': Name@84) = EmptyList@23[empty] // through LazyJavaClassMemberScope@83
-    functions('println': Name@85) = EmptyList@23[empty] // through LazyJavaClassMemberScope@83
-    functions('toString': Name@86) = ArrayList@87[1] { DeserializedSimpleFunctionDescriptor@88['toString'] } // through LazyJavaClassMemberScope@83
-    memberIndex = computeMemberIndex$1@89 // through LazyJavaClassMemberScope@83
-    properties('append': Name@72) = EmptyList@23[empty] // through LazyJavaClassMemberScope@83
-    properties('print': Name@90) = EmptyList@23[empty] // through LazyJavaClassMemberScope@83
-    properties('println': Name@91) = EmptyList@23[empty] // through LazyJavaClassMemberScope@83
-    properties('toString': Name@73) = EmptyList@23[empty] // through LazyJavaClassMemberScope@83
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@92['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassDescriptor@66['Appendable'] {
+    defaultType = JetTypeImpl@67['Appendable']
+    functions('append': Name@68) = ArrayList@69[3] { JavaMethodDescriptor@70['append'], JavaMethodDescriptor@71['append'], JavaMethodDescriptor@72['append'] } // through LazyJavaClassMemberScope@73
+    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@73
+    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@73
+    functions('toString': Name@77) = ArrayList@78[1] { DeserializedSimpleFunctionDescriptor@79['toString'] } // through LazyJavaClassMemberScope@73
+    memberIndex = computeMemberIndex$1@80 // through LazyJavaClassMemberScope@73
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@81['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassDescriptor@94['ArrayList'] {
-    constructors = ArrayList@95[3] { JavaConstructorDescriptor@96['<init>'], JavaConstructorDescriptor@97['<init>'], JavaConstructorDescriptor@98['<init>'] } // through LazyJavaClassMemberScope@99
-    defaultType = JetTypeImpl@100['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@101 // through LazyJavaClassMemberScope@99
+LazyJavaClassDescriptor@83['ArrayList'] {
+    constructors = ArrayList@84[3] { JavaConstructorDescriptor@85['<init>'], JavaConstructorDescriptor@86['<init>'], JavaConstructorDescriptor@87['<init>'] } // through LazyJavaClassMemberScope@88
+    defaultType = JetTypeImpl@89['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@90 // through LazyJavaClassMemberScope@88
     functionTypeForSamInterface = null
-    functions('add': Name@22) = ArrayList@102[2] { JavaMethodDescriptor@103['add'], JavaMethodDescriptor@104['add'] } // through LazyJavaClassMemberScope@99
-    functions('iterator': Name@24) = ArrayList@105[1] { JavaMethodDescriptor@106['iterator'] } // through LazyJavaClassMemberScope@99
-    memberIndex = computeMemberIndex$1@107 // through LazyJavaClassMemberScope@99
-    nestedClassIndex = LinkedHashMap@108 // through LazyJavaClassMemberScope@99
-    nestedClasses('add': Name@22) = null // through LazyJavaClassMemberScope@99
-    nestedClasses('iterator': Name@24) = null // through LazyJavaClassMemberScope@99
-    properties('add': Name@22) = EmptyList@23[empty] // through LazyJavaClassMemberScope@99
-    properties('iterator': Name@24) = EmptyList@23[empty] // through LazyJavaClassMemberScope@99
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@109['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@110['ArrayList']
+    functions('add': Name@91) = ArrayList@92[2] { JavaMethodDescriptor@93['add'], JavaMethodDescriptor@94['add'] } // through LazyJavaClassMemberScope@88
+    functions('iterator': Name@95) = ArrayList@96[1] { JavaMethodDescriptor@97['iterator'] } // through LazyJavaClassMemberScope@88
+    memberIndex = computeMemberIndex$1@98 // through LazyJavaClassMemberScope@88
+    nestedClassIndex = LinkedHashMap@99 // through LazyJavaClassMemberScope@88
+    nestedClasses('add': Name@91) = null // through LazyJavaClassMemberScope@88
+    nestedClasses('iterator': Name@95) = null // through LazyJavaClassMemberScope@88
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@100['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@101['ArrayList']
 }
 
-LazyJavaClassDescriptor@111['AutoCloseable'] {
-    functions('print': Name@84) = EmptyList@23[empty] // through LazyJavaClassMemberScope@112
-    functions('println': Name@85) = EmptyList@23[empty] // through LazyJavaClassMemberScope@112
-    memberIndex = computeMemberIndex$1@113 // through LazyJavaClassMemberScope@112
-    properties('print': Name@90) = EmptyList@23[empty] // through LazyJavaClassMemberScope@112
-    properties('println': Name@91) = EmptyList@23[empty] // through LazyJavaClassMemberScope@112
-    typeConstructor = LazyJavaClassTypeConstructor@114['AutoCloseable']
+LazyJavaClassDescriptor@102['AutoCloseable'] {
+    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@103
+    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@103
+    memberIndex = computeMemberIndex$1@104 // through LazyJavaClassMemberScope@103
+    typeConstructor = LazyJavaClassTypeConstructor@105['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@115['Closeable'] {
-    functions('print': Name@84) = EmptyList@23[empty] // through LazyJavaClassMemberScope@116
-    functions('println': Name@85) = EmptyList@23[empty] // through LazyJavaClassMemberScope@116
-    memberIndex = computeMemberIndex$1@117 // through LazyJavaClassMemberScope@116
-    properties('print': Name@90) = EmptyList@23[empty] // through LazyJavaClassMemberScope@116
-    properties('println': Name@91) = EmptyList@23[empty] // through LazyJavaClassMemberScope@116
-    typeConstructor = LazyJavaClassTypeConstructor@118['Closeable']
+LazyJavaClassDescriptor@106['Closeable'] {
+    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@107
+    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@107
+    memberIndex = computeMemberIndex$1@108 // through LazyJavaClassMemberScope@107
+    typeConstructor = LazyJavaClassTypeConstructor@109['Closeable']
 }
 
-LazyJavaClassDescriptor@119['FilterOutputStream'] {
-    functions('print': Name@84) = EmptyList@23[empty] // through LazyJavaClassMemberScope@120
-    functions('println': Name@85) = EmptyList@23[empty] // through LazyJavaClassMemberScope@120
-    memberIndex = computeMemberIndex$1@121 // through LazyJavaClassMemberScope@120
-    properties('print': Name@90) = EmptyList@23[empty] // through LazyJavaClassMemberScope@120
-    properties('println': Name@91) = EmptyList@23[empty] // through LazyJavaClassMemberScope@120
-    typeConstructor = LazyJavaClassTypeConstructor@122['FilterOutputStream']
+LazyJavaClassDescriptor@110['FilterOutputStream'] {
+    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@111
+    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@111
+    memberIndex = computeMemberIndex$1@112 // through LazyJavaClassMemberScope@111
+    typeConstructor = LazyJavaClassTypeConstructor@113['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@123['HashMap'] {
-    constructors = ArrayList@124[4] { JavaConstructorDescriptor@125['<init>'], JavaConstructorDescriptor@126['<init>'], JavaConstructorDescriptor@127['<init>'], ... } // through LazyJavaClassMemberScope@128
-    defaultType = JetTypeImpl@129['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@130 // through LazyJavaClassMemberScope@128
+LazyJavaClassDescriptor@114['HashMap'] {
+    constructors = ArrayList@115[4] { JavaConstructorDescriptor@116['<init>'], JavaConstructorDescriptor@117['<init>'], JavaConstructorDescriptor@118['<init>'], ... } // through LazyJavaClassMemberScope@119
+    defaultType = JetTypeImpl@120['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@121 // through LazyJavaClassMemberScope@119
     functionTypeForSamInterface = null
-    functions('get': Name@53) = ArrayList@131[1] { JavaMethodDescriptor@132['get'] } // through LazyJavaClassMemberScope@128
-    functions('keySet': Name@54) = ArrayList@133[1] { JavaMethodDescriptor@134['keySet'] } // through LazyJavaClassMemberScope@128
-    functions('put': Name@57) = ArrayList@135[1] { JavaMethodDescriptor@136['put'] } // through LazyJavaClassMemberScope@128
-    memberIndex = computeMemberIndex$1@137 // through LazyJavaClassMemberScope@128
-    nestedClassIndex = LinkedHashMap@138 // through LazyJavaClassMemberScope@128
-    nestedClasses('get': Name@53) = null // through LazyJavaClassMemberScope@128
-    nestedClasses('keySet': Name@54) = null // through LazyJavaClassMemberScope@128
-    nestedClasses('put': Name@57) = null // through LazyJavaClassMemberScope@128
-    properties('get': Name@53) = EmptyList@23[empty] // through LazyJavaClassMemberScope@128
-    properties('keySet': Name@54) = ArrayList@139[1] { PropertyDescriptorImpl@140['keySet'] } // through LazyJavaClassMemberScope@128
-    properties('put': Name@57) = EmptyList@23[empty] // through LazyJavaClassMemberScope@128
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@141['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@142['HashMap']
+    functions('get': Name@122) = ArrayList@123[1] { JavaMethodDescriptor@124['get'] } // through LazyJavaClassMemberScope@119
+    functions('keySet': Name@125) = ArrayList@126[1] { JavaMethodDescriptor@127['keySet'] } // through LazyJavaClassMemberScope@119
+    functions('put': Name@128) = ArrayList@129[1] { JavaMethodDescriptor@130['put'] } // through LazyJavaClassMemberScope@119
+    memberIndex = computeMemberIndex$1@131 // through LazyJavaClassMemberScope@119
+    nestedClassIndex = LinkedHashMap@132 // through LazyJavaClassMemberScope@119
+    nestedClasses('get': Name@122) = null // through LazyJavaClassMemberScope@119
+    nestedClasses('keySet': Name@125) = null // through LazyJavaClassMemberScope@119
+    nestedClasses('put': Name@128) = null // through LazyJavaClassMemberScope@119
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@133['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@134['HashMap']
 }
 
-LazyJavaClassDescriptor@143['OutputStream'] {
-    functions('print': Name@84) = EmptyList@23[empty] // through LazyJavaClassMemberScope@144
-    functions('println': Name@85) = EmptyList@23[empty] // through LazyJavaClassMemberScope@144
-    memberIndex = computeMemberIndex$1@145 // through LazyJavaClassMemberScope@144
-    properties('print': Name@90) = EmptyList@23[empty] // through LazyJavaClassMemberScope@144
-    properties('println': Name@91) = EmptyList@23[empty] // through LazyJavaClassMemberScope@144
-    typeConstructor = LazyJavaClassTypeConstructor@146['OutputStream']
+LazyJavaClassDescriptor@135['OutputStream'] {
+    functions('print': Name@74) = EmptyList@75[empty] // through LazyJavaClassMemberScope@136
+    functions('println': Name@76) = EmptyList@75[empty] // through LazyJavaClassMemberScope@136
+    memberIndex = computeMemberIndex$1@137 // through LazyJavaClassMemberScope@136
+    typeConstructor = LazyJavaClassTypeConstructor@138['OutputStream']
 }
 
-LazyJavaClassDescriptor@147['PrintStream'] {
-    defaultType = JetTypeImpl@148['PrintStream']
-    enumEntryIndex = LinkedHashMap@149 // through LazyJavaClassMemberScope@150
-    functions('print': Name@90) = ArrayList@151[9] { JavaMethodDescriptor@152['print'], JavaMethodDescriptor@153['print'], JavaMethodDescriptor@154['print'], ... } // through LazyJavaClassMemberScope@150
-    functions('println': Name@91) = ArrayList@155[10] { JavaMethodDescriptor@156['println'], JavaMethodDescriptor@157['println'], JavaMethodDescriptor@158['println'], ... } // through LazyJavaClassMemberScope@150
-    memberIndex = computeMemberIndex$1@159 // through LazyJavaClassMemberScope@150
-    nestedClassIndex = LinkedHashMap@160 // through LazyJavaClassMemberScope@150
-    nestedClasses('print': Name@90) = null // through LazyJavaClassMemberScope@150
-    nestedClasses('println': Name@91) = null // through LazyJavaClassMemberScope@150
-    properties('print': Name@90) = EmptyList@23[empty] // through LazyJavaClassMemberScope@150
-    properties('println': Name@91) = EmptyList@23[empty] // through LazyJavaClassMemberScope@150
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@161['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@162['PrintStream']
+LazyJavaClassDescriptor@139['PrintStream'] {
+    defaultType = JetTypeImpl@140['PrintStream']
+    enumEntryIndex = LinkedHashMap@141 // through LazyJavaClassMemberScope@142
+    functions('print': Name@143) = ArrayList@144[9] { JavaMethodDescriptor@145['print'], JavaMethodDescriptor@146['print'], JavaMethodDescriptor@147['print'], ... } // through LazyJavaClassMemberScope@142
+    functions('println': Name@148) = ArrayList@149[10] { JavaMethodDescriptor@150['println'], JavaMethodDescriptor@151['println'], JavaMethodDescriptor@152['println'], ... } // through LazyJavaClassMemberScope@142
+    memberIndex = computeMemberIndex$1@153 // through LazyJavaClassMemberScope@142
+    nestedClassIndex = LinkedHashMap@154 // through LazyJavaClassMemberScope@142
+    nestedClasses('print': Name@143) = null // through LazyJavaClassMemberScope@142
+    nestedClasses('println': Name@148) = null // through LazyJavaClassMemberScope@142
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@155['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@156['PrintStream']
 }
 
-LazyJavaClassDescriptor@163['RandomAccess'] {
-    functions('add': Name@29) = EmptyList@23[empty] // through LazyJavaClassMemberScope@164
-    functions('iterator': Name@34) = EmptyList@23[empty] // through LazyJavaClassMemberScope@164
-    memberIndex = computeMemberIndex$1@165 // through LazyJavaClassMemberScope@164
-    properties('add': Name@22) = EmptyList@23[empty] // through LazyJavaClassMemberScope@164
-    properties('iterator': Name@24) = EmptyList@23[empty] // through LazyJavaClassMemberScope@164
-    typeConstructor = LazyJavaClassTypeConstructor@166['RandomAccess']
+LazyJavaClassDescriptor@157['RandomAccess'] {
+    functions('add': Name@26) = EmptyList@75[empty] // through LazyJavaClassMemberScope@158
+    functions('iterator': Name@31) = EmptyList@75[empty] // through LazyJavaClassMemberScope@158
+    memberIndex = computeMemberIndex$1@159 // through LazyJavaClassMemberScope@158
+    typeConstructor = LazyJavaClassTypeConstructor@160['RandomAccess']
 }
 
-LazyJavaClassDescriptor@167['Serializable'] {
-    defaultType = JetTypeImpl@168['Serializable']
-    functions('add': Name@29) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    functions('append': Name@62) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    functions('get': Name@42) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    functions('iterator': Name@34) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    functions('keySet': Name@46) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    functions('put': Name@49) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    functions('toString': Name@68) = ArrayList@170[1] { DeserializedSimpleFunctionDescriptor@171['toString'] } // through LazyJavaClassMemberScope@169
-    memberIndex = computeMemberIndex$1@172 // through LazyJavaClassMemberScope@169
-    properties('add': Name@22) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    properties('append': Name@72) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    properties('get': Name@53) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    properties('iterator': Name@24) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    properties('keySet': Name@54) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    properties('put': Name@57) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    properties('toString': Name@73) = EmptyList@23[empty] // through LazyJavaClassMemberScope@169
-    typeConstructor = LazyJavaClassTypeConstructor@173['Serializable']
+LazyJavaClassDescriptor@161['Serializable'] {
+    defaultType = JetTypeImpl@162['Serializable']
+    functions('add': Name@26) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
+    functions('append': Name@54) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
+    functions('get': Name@39) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
+    functions('iterator': Name@31) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
+    functions('keySet': Name@43) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
+    functions('put': Name@46) = EmptyList@75[empty] // through LazyJavaClassMemberScope@163
+    functions('toString': Name@60) = ArrayList@164[1] { DeserializedSimpleFunctionDescriptor@165['toString'] } // through LazyJavaClassMemberScope@163
+    memberIndex = computeMemberIndex$1@166 // through LazyJavaClassMemberScope@163
+    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
 }
 
-LazyJavaClassDescriptor@174['StringBuffer'] {
+LazyJavaClassDescriptor@168['StringBuffer'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@175['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
 }
 
-LazyJavaClassDescriptor@176['StringBuilder'] {
-    constructors = ArrayList@177[4] { JavaConstructorDescriptor@178['<init>'], JavaConstructorDescriptor@179['<init>'], JavaConstructorDescriptor@180['<init>'], ... } // through LazyJavaClassMemberScope@181
-    defaultType = JetTypeImpl@182['StringBuilder']
-    enumEntryIndex = LinkedHashMap@183 // through LazyJavaClassMemberScope@181
+LazyJavaClassDescriptor@170['StringBuilder'] {
+    constructors = ArrayList@171[4] { JavaConstructorDescriptor@172['<init>'], JavaConstructorDescriptor@173['<init>'], JavaConstructorDescriptor@174['<init>'], ... } // through LazyJavaClassMemberScope@175
+    defaultType = JetTypeImpl@176['StringBuilder']
+    enumEntryIndex = LinkedHashMap@177 // through LazyJavaClassMemberScope@175
     functionTypeForSamInterface = null
-    functions('append': Name@72) = ArrayList@184[14] { JavaMethodDescriptor@185['append'], JavaMethodDescriptor@186['append'], JavaMethodDescriptor@187['append'], ... } // through LazyJavaClassMemberScope@181
-    functions('toString': Name@73) = ArrayList@188[1] { JavaMethodDescriptor@189['toString'] } // through LazyJavaClassMemberScope@181
-    memberIndex = computeMemberIndex$1@190 // through LazyJavaClassMemberScope@181
-    nestedClassIndex = LinkedHashMap@191 // through LazyJavaClassMemberScope@181
-    nestedClasses('append': Name@72) = null // through LazyJavaClassMemberScope@181
-    nestedClasses('toString': Name@73) = null // through LazyJavaClassMemberScope@181
-    properties('append': Name@72) = EmptyList@23[empty] // through LazyJavaClassMemberScope@181
-    properties('toString': Name@73) = EmptyList@23[empty] // through LazyJavaClassMemberScope@181
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@192['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+    functions('append': Name@178) = ArrayList@179[14] { JavaMethodDescriptor@180['append'], JavaMethodDescriptor@181['append'], JavaMethodDescriptor@182['append'], ... } // through LazyJavaClassMemberScope@175
+    functions('toString': Name@183) = ArrayList@184[1] { JavaMethodDescriptor@185['toString'] } // through LazyJavaClassMemberScope@175
+    memberIndex = computeMemberIndex$1@186 // through LazyJavaClassMemberScope@175
+    nestedClassIndex = LinkedHashMap@187 // through LazyJavaClassMemberScope@175
+    nestedClasses('append': Name@178) = null // through LazyJavaClassMemberScope@175
+    nestedClasses('toString': Name@183) = null // through LazyJavaClassMemberScope@175
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@188['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassDescriptor@194['System'] {
-    enumEntryIndex = LinkedHashMap@195 // through LazyJavaClassMemberScope@196
-    memberIndex = computeMemberIndex$1@197 // through LazyJavaClassMemberScope@196
-    memberIndex = computeMemberIndex$1@198 // through LazyJavaStaticClassScope@199
-    nestedClassIndex = LinkedHashMap@200 // through LazyJavaClassMemberScope@196
-    nestedClasses('out': Name@201) = null // through LazyJavaClassMemberScope@196
-    properties('out': Name@201) = ArrayList@202[1] { JavaPropertyDescriptor@203['out'] } // through LazyJavaStaticClassScope@199
-    properties('out': Name@201) = EmptyList@23[empty] // through LazyJavaClassMemberScope@196
-    typeConstructor = LazyJavaClassTypeConstructor@204['System']
+LazyJavaClassDescriptor@190['System'] {
+    enumEntryIndex = LinkedHashMap@191 // through LazyJavaClassMemberScope@192
+    memberIndex = computeMemberIndex$1@193 // through LazyJavaClassMemberScope@192
+    memberIndex = computeMemberIndex$1@194 // through LazyJavaStaticClassScope@195
+    nestedClassIndex = LinkedHashMap@196 // through LazyJavaClassMemberScope@192
+    nestedClasses('out': Name@197) = null // through LazyJavaClassMemberScope@192
+    properties('out': Name@197) = ArrayList@198[1] { JavaPropertyDescriptor@199['out'] } // through LazyJavaStaticClassScope@195
+    properties('out': Name@197) = EmptyList@75[empty] // through LazyJavaClassMemberScope@192
+    typeConstructor = LazyJavaClassTypeConstructor@200['System']
 }
 
-LazyJavaClassTypeConstructor@26['AbstractCollection'] {
+LazyJavaClassTypeConstructor@23['AbstractCollection'] {
+    parameters = ArrayList@201[1] { LazyJavaTypeParameterDescriptor@202['E'] }
+    supertypes = ArrayList@203[1] { LazyJavaClassifierType@204['Collection<E>'] }
+}
+
+LazyJavaClassTypeConstructor@36['AbstractList'] {
     parameters = ArrayList@205[1] { LazyJavaTypeParameterDescriptor@206['E'] }
-    supertypes = ArrayList@207[1] { LazyJavaClassifierType@208['Collection<E>'] }
+    supertypes = ArrayList@207[2] { LazyJavaClassifierType@208['AbstractCollection<E>'], LazyJavaClassifierType@209['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@39['AbstractList'] {
-    parameters = ArrayList@209[1] { LazyJavaTypeParameterDescriptor@210['E'] }
-    supertypes = ArrayList@211[2] { LazyJavaClassifierType@212['AbstractCollection<E>'], LazyJavaClassifierType@213['List<E>'] }
+LazyJavaClassTypeConstructor@51['AbstractMap'] {
+    parameters = ArrayList@210[2] { LazyJavaTypeParameterDescriptor@211['K'], LazyJavaTypeParameterDescriptor@212['V'] }
+    supertypes = ArrayList@213[1] { LazyJavaClassifierType@214['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@59['AbstractMap'] {
-    parameters = ArrayList@214[2] { LazyJavaTypeParameterDescriptor@215['K'], LazyJavaTypeParameterDescriptor@216['V'] }
-    supertypes = ArrayList@217[1] { LazyJavaClassifierType@218['Map<K, V>'] }
+LazyJavaClassTypeConstructor@65['AbstractStringBuilder'] {
+    parameters = ArrayList@215[empty]
+    supertypes = ArrayList@216[2] { LazyJavaClassifierType@217['Appendable'], LazyJavaClassifierType@218['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@75['AbstractStringBuilder'] {
+LazyJavaClassTypeConstructor@82['Appendable'] {
     parameters = ArrayList@219[empty]
-    supertypes = ArrayList@220[2] { LazyJavaClassifierType@221['Appendable'], LazyJavaClassifierType@222['CharSequence'] }
+    supertypes = ArrayList@220[1] { JetTypeImpl@221['Any'] }
 }
 
-LazyJavaClassTypeConstructor@93['Appendable'] {
-    parameters = ArrayList@223[empty]
-    supertypes = ArrayList@224[1] { JetTypeImpl@225['Any'] }
+LazyJavaClassTypeConstructor@101['ArrayList'] {
+    parameters = ArrayList@222[1] { LazyJavaTypeParameterDescriptor@223['E'] }
+    supertypes = ArrayList@224[5] { LazyJavaClassifierType@225['AbstractList<E>'], LazyJavaClassifierType@226['List<E>'], LazyJavaClassifierType@227['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@110['ArrayList'] {
-    parameters = ArrayList@226[1] { LazyJavaTypeParameterDescriptor@227['E'] }
-    supertypes = ArrayList@228[5] { LazyJavaClassifierType@229['AbstractList<E>'], LazyJavaClassifierType@230['List<E>'], LazyJavaClassifierType@231['RandomAccess'], ... }
+LazyJavaClassTypeConstructor@105['AutoCloseable'] {
+    parameters = ArrayList@228[empty]
+    supertypes = ArrayList@229[1] { JetTypeImpl@221['Any'] }
 }
 
-LazyJavaClassTypeConstructor@114['AutoCloseable'] {
-    parameters = ArrayList@232[empty]
-    supertypes = ArrayList@233[1] { JetTypeImpl@225['Any'] }
+LazyJavaClassTypeConstructor@109['Closeable'] {
+    parameters = ArrayList@230[empty]
+    supertypes = ArrayList@231[1] { LazyJavaClassifierType@232['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@118['Closeable'] {
-    parameters = ArrayList@234[empty]
-    supertypes = ArrayList@235[1] { LazyJavaClassifierType@236['AutoCloseable'] }
+LazyJavaClassTypeConstructor@113['FilterOutputStream'] {
+    parameters = ArrayList@233[empty]
+    supertypes = ArrayList@234[1] { LazyJavaClassifierType@235['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@122['FilterOutputStream'] {
-    parameters = ArrayList@237[empty]
-    supertypes = ArrayList@238[1] { LazyJavaClassifierType@239['OutputStream'] }
+LazyJavaClassTypeConstructor@134['HashMap'] {
+    parameters = ArrayList@236[2] { LazyJavaTypeParameterDescriptor@237['K'], LazyJavaTypeParameterDescriptor@238['V'] }
+    supertypes = ArrayList@239[4] { LazyJavaClassifierType@240['AbstractMap<K, V>'], LazyJavaClassifierType@241['Map<K, V>'], LazyJavaClassifierType@242['Cloneable'], ... }
 }
 
-LazyJavaClassTypeConstructor@142['HashMap'] {
-    parameters = ArrayList@240[2] { LazyJavaTypeParameterDescriptor@241['K'], LazyJavaTypeParameterDescriptor@242['V'] }
-    supertypes = ArrayList@243[4] { LazyJavaClassifierType@244['AbstractMap<K, V>'], LazyJavaClassifierType@245['Map<K, V>'], LazyJavaClassifierType@246['Cloneable'], ... }
+LazyJavaClassTypeConstructor@138['OutputStream'] {
+    parameters = ArrayList@243[empty]
+    supertypes = ArrayList@244[1] { LazyJavaClassifierType@245['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@146['OutputStream'] {
-    parameters = ArrayList@247[empty]
-    supertypes = ArrayList@248[1] { LazyJavaClassifierType@249['Closeable'] }
+LazyJavaClassTypeConstructor@156['PrintStream'] {
+    parameters = ArrayList@246[empty]
+    supertypes = ArrayList@247[3] { LazyJavaClassifierType@248['FilterOutputStream'], LazyJavaClassifierType@249['Appendable'], LazyJavaClassifierType@250['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@162['PrintStream'] {
-    parameters = ArrayList@250[empty]
-    supertypes = ArrayList@251[3] { LazyJavaClassifierType@252['FilterOutputStream'], LazyJavaClassifierType@253['Appendable'], LazyJavaClassifierType@254['Closeable'] }
+LazyJavaClassTypeConstructor@160['RandomAccess'] {
+    parameters = ArrayList@251[empty]
+    supertypes = ArrayList@252[1] { JetTypeImpl@221['Any'] }
 }
 
-LazyJavaClassTypeConstructor@166['RandomAccess'] {
+LazyJavaClassTypeConstructor@167['Serializable'] {
+    parameters = ArrayList@253[empty]
+    supertypes = ArrayList@254[1] { JetTypeImpl@221['Any'] }
+}
+
+LazyJavaClassTypeConstructor@169['StringBuffer'] {
     parameters = ArrayList@255[empty]
-    supertypes = ArrayList@256[1] { JetTypeImpl@225['Any'] }
+    supertypes = ArrayList@256[3] { LazyJavaClassifierType@257['AbstractStringBuilder'], LazyJavaClassifierType@258['Serializable'], LazyJavaClassifierType@259['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@173['Serializable'] {
-    parameters = ArrayList@257[empty]
-    supertypes = ArrayList@258[1] { JetTypeImpl@225['Any'] }
+LazyJavaClassTypeConstructor@189['StringBuilder'] {
+    parameters = ArrayList@260[empty]
+    supertypes = ArrayList@261[3] { LazyJavaClassifierType@262['AbstractStringBuilder'], LazyJavaClassifierType@263['Serializable'], LazyJavaClassifierType@264['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@175['StringBuffer'] {
-    parameters = ArrayList@259[empty]
-    supertypes = ArrayList@260[3] { LazyJavaClassifierType@261['AbstractStringBuilder'], LazyJavaClassifierType@262['Serializable'], LazyJavaClassifierType@263['CharSequence'] }
+LazyJavaClassTypeConstructor@200['System'] {
+    supertypes = ArrayList@265[1] { JetTypeImpl@221['Any'] }
 }
 
-LazyJavaClassTypeConstructor@193['StringBuilder'] {
-    parameters = ArrayList@264[empty]
-    supertypes = ArrayList@265[3] { LazyJavaClassifierType@266['AbstractStringBuilder'], LazyJavaClassifierType@267['Serializable'], LazyJavaClassifierType@268['CharSequence'] }
+LazyJavaClassifierType@208['AbstractCollection<E>'] {
+    arguments = ArrayList@266[1] { TypeProjectionImpl@267 }
+    classifier = JavaClassImpl@268['AbstractCollection']
+    memberScope = SubstitutingScope@269
+    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractCollection']
 }
 
-LazyJavaClassTypeConstructor@204['System'] {
-    supertypes = ArrayList@269[1] { JetTypeImpl@225['Any'] }
-}
-
-LazyJavaClassifierType@212['AbstractCollection<E>'] {
+LazyJavaClassifierType@225['AbstractList<E>'] {
     arguments = ArrayList@270[1] { TypeProjectionImpl@271 }
-    classifier = JavaClassImpl@272['AbstractCollection']
+    classifier = JavaClassImpl@272['AbstractList']
     memberScope = SubstitutingScope@273
-    typeConstructor = LazyJavaClassTypeConstructor@26['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
 }
 
-LazyJavaClassifierType@229['AbstractList<E>'] {
-    arguments = ArrayList@274[1] { TypeProjectionImpl@275 }
-    classifier = JavaClassImpl@276['AbstractList']
-    memberScope = SubstitutingScope@277
-    typeConstructor = LazyJavaClassTypeConstructor@39['AbstractList']
+LazyJavaClassifierType@240['AbstractMap<K, V>'] {
+    arguments = ArrayList@274[2] { TypeProjectionImpl@275, TypeProjectionImpl@276 }
+    classifier = JavaClassImpl@277['AbstractMap']
+    memberScope = SubstitutingScope@278
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractMap']
 }
 
-LazyJavaClassifierType@244['AbstractMap<K, V>'] {
-    arguments = ArrayList@278[2] { TypeProjectionImpl@279, TypeProjectionImpl@280 }
-    classifier = JavaClassImpl@281['AbstractMap']
-    memberScope = SubstitutingScope@282
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractMap']
+LazyJavaClassifierType@262['AbstractStringBuilder'] {
+    arguments = ArrayList@279[empty]
+    classifier = JavaClassImpl@280['AbstractStringBuilder']
+    memberScope = LazyJavaClassMemberScope@59
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@266['AbstractStringBuilder'] {
-    arguments = ArrayList@283[empty]
-    classifier = JavaClassImpl@284['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@281['AbstractStringBuilder'] {
+    arguments = ArrayList@282[empty]
+    classifier = JavaClassImpl@283['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@285['AbstractStringBuilder'] {
     arguments = ArrayList@286[empty]
     classifier = JavaClassImpl@287['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@289['AbstractStringBuilder'] {
-    arguments = ArrayList@290[empty]
-    classifier = JavaClassImpl@291['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@288['AbstractStringBuilder'] {
+    arguments = ArrayList@289[empty]
+    classifier = JavaClassImpl@290['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@292['AbstractStringBuilder'] {
-    arguments = ArrayList@293[empty]
-    classifier = JavaClassImpl@294['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@291['AbstractStringBuilder'] {
+    arguments = ArrayList@292[empty]
+    classifier = JavaClassImpl@293['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@295['AbstractStringBuilder'] {
-    arguments = ArrayList@296[empty]
-    classifier = JavaClassImpl@297['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@294['AbstractStringBuilder'] {
+    arguments = ArrayList@295[empty]
+    classifier = JavaClassImpl@296['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@298['AbstractStringBuilder'] {
-    arguments = ArrayList@299[empty]
-    classifier = JavaClassImpl@300['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@297['AbstractStringBuilder'] {
+    arguments = ArrayList@298[empty]
+    classifier = JavaClassImpl@299['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@301['AbstractStringBuilder'] {
-    arguments = ArrayList@302[empty]
-    classifier = JavaClassImpl@303['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@300['AbstractStringBuilder'] {
+    arguments = ArrayList@301[empty]
+    classifier = JavaClassImpl@302['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@304['AbstractStringBuilder'] {
-    arguments = ArrayList@305[empty]
-    classifier = JavaClassImpl@306['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@303['AbstractStringBuilder'] {
+    arguments = ArrayList@304[empty]
+    classifier = JavaClassImpl@305['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@307['AbstractStringBuilder'] {
-    arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@309['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@306['AbstractStringBuilder'] {
+    arguments = ArrayList@307[empty]
+    classifier = JavaClassImpl@308['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@310['AbstractStringBuilder'] {
-    arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@312['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@309['AbstractStringBuilder'] {
+    arguments = ArrayList@310[empty]
+    classifier = JavaClassImpl@311['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@313['AbstractStringBuilder'] {
-    arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@315['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@312['AbstractStringBuilder'] {
+    arguments = ArrayList@313[empty]
+    classifier = JavaClassImpl@314['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@316['AbstractStringBuilder'] {
-    arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@318['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@315['AbstractStringBuilder'] {
+    arguments = ArrayList@316[empty]
+    classifier = JavaClassImpl@317['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@319['AbstractStringBuilder'] {
-    arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@321['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@318['AbstractStringBuilder'] {
+    arguments = ArrayList@319[empty]
+    classifier = JavaClassImpl@320['AbstractStringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@322['AbstractStringBuilder'] {
-    arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@324['AbstractStringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@321['AbstractStringBuilder'] {
+    arguments = ArrayList@322[empty]
+    classifier = JavaClassImpl@317['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@325['AbstractStringBuilder'] {
-    arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@291['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@324['AbstractStringBuilder'] {
+    arguments = ArrayList@325[empty]
+    classifier = JavaClassImpl@308['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
+}
+
+LazyJavaClassifierType@326['AbstractStringBuilder'] {
+    arguments = ArrayList@327[empty]
+    classifier = JavaClassImpl@320['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@328['AbstractStringBuilder'] {
     arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@303['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@290['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@330['AbstractStringBuilder'] {
     arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@297['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@283['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@332['AbstractStringBuilder'] {
     arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@287['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@305['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@334['AbstractStringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@312['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@314['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@336['AbstractStringBuilder'] {
     arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@321['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@302['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@338['AbstractStringBuilder'] {
     arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@309['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@311['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@340['AbstractStringBuilder'] {
     arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@306['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@296['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@342['AbstractStringBuilder'] {
     arguments = ArrayList@343[empty]
-    classifier = JavaClassImpl@315['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@287['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@344['AbstractStringBuilder'] {
     arguments = ArrayList@345[empty]
-    classifier = JavaClassImpl@324['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@299['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@346['AbstractStringBuilder'] {
     arguments = ArrayList@347[empty]
-    classifier = JavaClassImpl@294['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@293['AbstractStringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@348['AbstractStringBuilder'] {
-    arguments = ArrayList@349[empty]
-    classifier = JavaClassImpl@300['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@257['AbstractStringBuilder'] {
+    arguments = ArrayList@348[empty]
+    classifier = JavaClassImpl@349['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@65['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@350['AbstractStringBuilder'] {
-    arguments = ArrayList@351[empty]
-    classifier = JavaClassImpl@318['AbstractStringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+LazyJavaClassifierType@249['Appendable'] {
+    arguments = ArrayList@350[empty]
+    classifier = JavaClassImpl@351['Appendable']
+    memberScope = LazyJavaClassMemberScope@73
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassifierType@261['AbstractStringBuilder'] {
+LazyJavaClassifierType@217['Appendable'] {
     arguments = ArrayList@352[empty]
-    classifier = JavaClassImpl@353['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@75['AbstractStringBuilder']
+    classifier = JavaClassImpl@353['Appendable']
+    memberScope = LazyJavaClassMemberScope@73
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassifierType@221['Appendable'] {
-    arguments = ArrayList@354[empty]
-    classifier = JavaClassImpl@355['Appendable']
-    memberScope = LazyJavaClassMemberScope@83
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassifierType@354['Appendable'] {
+    arguments = ArrayList@355[empty]
+    classifier = JavaClassImpl@356['Appendable']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassifierType@253['Appendable'] {
-    arguments = ArrayList@356[empty]
-    classifier = JavaClassImpl@357['Appendable']
-    memberScope = LazyJavaClassMemberScope@83
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassifierType@357['Appendable'] {
+    arguments = ArrayList@358[empty]
+    classifier = JavaClassImpl@359['Appendable']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassifierType@358['Appendable'] {
-    arguments = ArrayList@359[empty]
-    classifier = JavaClassImpl@360['Appendable']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassifierType@360['Appendable'] {
+    arguments = ArrayList@361[empty]
+    classifier = JavaClassImpl@362['Appendable']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassifierType@361['Appendable'] {
-    arguments = ArrayList@362[empty]
-    classifier = JavaClassImpl@363['Appendable']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassifierType@363['Appendable'] {
+    arguments = ArrayList@364[empty]
+    classifier = JavaClassImpl@356['Appendable']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassifierType@364['Appendable'] {
-    arguments = ArrayList@365[empty]
-    classifier = JavaClassImpl@366['Appendable']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassifierType@365['Appendable'] {
+    arguments = ArrayList@366[empty]
+    classifier = JavaClassImpl@362['Appendable']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
 LazyJavaClassifierType@367['Appendable'] {
     arguments = ArrayList@368[empty]
-    classifier = JavaClassImpl@363['Appendable']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+    classifier = JavaClassImpl@359['Appendable']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@82['Appendable']
 }
 
-LazyJavaClassifierType@369['Appendable'] {
-    arguments = ArrayList@370[empty]
-    classifier = JavaClassImpl@360['Appendable']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassifierType@232['AutoCloseable'] {
+    arguments = ArrayList@369[empty]
+    classifier = JavaClassImpl@370['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@103
+    typeConstructor = LazyJavaClassTypeConstructor@105['AutoCloseable']
 }
 
-LazyJavaClassifierType@371['Appendable'] {
-    arguments = ArrayList@372[empty]
-    classifier = JavaClassImpl@366['Appendable']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@93['Appendable']
+LazyJavaClassifierType@218['CharSequence'] {
+    arguments = ArrayList@371[empty]
+    classifier = JavaClassImpl@372['CharSequence']
+    memberScope = DeserializedClassMemberScope@373
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@236['AutoCloseable'] {
-    arguments = ArrayList@373[empty]
-    classifier = JavaClassImpl@374['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@112
-    typeConstructor = LazyJavaClassTypeConstructor@114['AutoCloseable']
-}
-
-LazyJavaClassifierType@222['CharSequence'] {
+LazyJavaClassifierType@264['CharSequence'] {
     arguments = ArrayList@375[empty]
     classifier = JavaClassImpl@376['CharSequence']
-    memberScope = DeserializedClassMemberScope@377
-    typeConstructor = DeserializedClassTypeConstructor@378
+    memberScope = DeserializedClassMemberScope@373
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@268['CharSequence'] {
-    arguments = ArrayList@379[empty]
-    classifier = JavaClassImpl@380['CharSequence']
-    memberScope = DeserializedClassMemberScope@377
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@377['CharSequence'] {
+    arguments = ArrayList@378[empty]
+    classifier = JavaClassImpl@379['CharSequence']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@381['CharSequence'] {
-    arguments = ArrayList@382[empty]
-    classifier = JavaClassImpl@383['CharSequence']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@380['CharSequence'] {
+    arguments = ArrayList@381[empty]
+    classifier = JavaClassImpl@382['CharSequence']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@384['CharSequence'] {
-    arguments = ArrayList@385[empty]
-    classifier = JavaClassImpl@386['CharSequence']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@383['CharSequence'] {
+    arguments = ArrayList@384[empty]
+    classifier = JavaClassImpl@385['CharSequence']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@387['CharSequence'] {
-    arguments = ArrayList@388[empty]
-    classifier = JavaClassImpl@389['CharSequence']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@386['CharSequence'] {
+    arguments = ArrayList@387[empty]
+    classifier = JavaClassImpl@388['CharSequence']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@390['CharSequence'] {
-    arguments = ArrayList@391[empty]
-    classifier = JavaClassImpl@392['CharSequence']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@389['CharSequence'] {
+    arguments = ArrayList@390[empty]
+    classifier = JavaClassImpl@391['CharSequence']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@393['CharSequence'] {
-    arguments = ArrayList@394[empty]
-    classifier = JavaClassImpl@395['CharSequence']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@392['CharSequence'] {
+    arguments = ArrayList@393[empty]
+    classifier = JavaClassImpl@394['CharSequence']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@396['CharSequence'] {
-    arguments = ArrayList@397[empty]
-    classifier = JavaClassImpl@398['CharSequence']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@395['CharSequence'] {
+    arguments = ArrayList@396[empty]
+    classifier = JavaClassImpl@397['CharSequence']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@399['CharSequence'] {
-    arguments = ArrayList@400[empty]
-    classifier = JavaClassImpl@401['CharSequence']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@378
+LazyJavaClassifierType@398['CharSequence'] {
+    arguments = ArrayList@399[empty]
+    classifier = JavaClassImpl@385['CharSequence']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@374
+}
+
+LazyJavaClassifierType@400['CharSequence'] {
+    arguments = ArrayList@401[empty]
+    classifier = JavaClassImpl@394['CharSequence']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@402['CharSequence'] {
     arguments = ArrayList@403[empty]
-    classifier = JavaClassImpl@389['CharSequence']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@378
+    classifier = JavaClassImpl@382['CharSequence']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@404['CharSequence'] {
     arguments = ArrayList@405[empty]
-    classifier = JavaClassImpl@383['CharSequence']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@378
+    classifier = JavaClassImpl@379['CharSequence']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@406['CharSequence'] {
     arguments = ArrayList@407[empty]
-    classifier = JavaClassImpl@386['CharSequence']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@378
+    classifier = JavaClassImpl@397['CharSequence']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@408['CharSequence'] {
     arguments = ArrayList@409[empty]
-    classifier = JavaClassImpl@392['CharSequence']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@378
+    classifier = JavaClassImpl@391['CharSequence']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
 LazyJavaClassifierType@410['CharSequence'] {
     arguments = ArrayList@411[empty]
-    classifier = JavaClassImpl@395['CharSequence']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@378
+    classifier = JavaClassImpl@388['CharSequence']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@374
 }
 
-LazyJavaClassifierType@412['CharSequence'] {
+LazyJavaClassifierType@259['CharSequence'] {
+    classifier = JavaClassImpl@412['CharSequence']
+    typeConstructor = DeserializedClassTypeConstructor@374
+}
+
+LazyJavaClassifierType@242['Cloneable'] {
     arguments = ArrayList@413[empty]
-    classifier = JavaClassImpl@401['CharSequence']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@378
-}
-
-LazyJavaClassifierType@414['CharSequence'] {
-    arguments = ArrayList@415[empty]
-    classifier = JavaClassImpl@398['CharSequence']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@378
-}
-
-LazyJavaClassifierType@263['CharSequence'] {
-    classifier = JavaClassImpl@416['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@378
+    classifier = JavaClassImpl@414['Cloneable']
+    memberScope = DeserializedClassMemberScope@415
+    typeConstructor = DeserializedClassTypeConstructor@416
 }
 
 LazyJavaClassifierType@417['Cloneable'] {
     arguments = ArrayList@418[empty]
     classifier = JavaClassImpl@419['Cloneable']
-    memberScope = DeserializedClassMemberScope@420
-    typeConstructor = DeserializedClassTypeConstructor@421
+    memberScope = DeserializedClassMemberScope@415
+    typeConstructor = DeserializedClassTypeConstructor@416
 }
 
-LazyJavaClassifierType@246['Cloneable'] {
+LazyJavaClassifierType@250['Closeable'] {
+    arguments = ArrayList@420[empty]
+    classifier = JavaClassImpl@421['Closeable']
+    memberScope = LazyJavaClassMemberScope@107
+    typeConstructor = LazyJavaClassTypeConstructor@109['Closeable']
+}
+
+LazyJavaClassifierType@245['Closeable'] {
     arguments = ArrayList@422[empty]
-    classifier = JavaClassImpl@423['Cloneable']
-    memberScope = DeserializedClassMemberScope@420
-    typeConstructor = DeserializedClassTypeConstructor@421
+    classifier = JavaClassImpl@423['Closeable']
+    memberScope = LazyJavaClassMemberScope@107
+    typeConstructor = LazyJavaClassTypeConstructor@109['Closeable']
 }
 
-LazyJavaClassifierType@249['Closeable'] {
-    arguments = ArrayList@424[empty]
-    classifier = JavaClassImpl@425['Closeable']
-    memberScope = LazyJavaClassMemberScope@116
-    typeConstructor = LazyJavaClassTypeConstructor@118['Closeable']
+LazyJavaClassifierType@424['Collection<? extends E>'] {
+    arguments = ArrayList@425[1] { TypeProjectionImpl@426 }
+    classifier = JavaClassImpl@427['Collection']
+    memberScope = SubstitutingScope@428
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@429
 }
 
-LazyJavaClassifierType@254['Closeable'] {
-    arguments = ArrayList@426[empty]
-    classifier = JavaClassImpl@427['Closeable']
-    memberScope = LazyJavaClassMemberScope@116
-    typeConstructor = LazyJavaClassTypeConstructor@118['Closeable']
+LazyJavaClassifierType@430['Collection<? extends E>'] {
+    arguments = ArrayList@431[1] { TypeProjectionImpl@432 }
+    classifier = JavaClassImpl@427['Collection']
+    memberScope = SubstitutingScope@433
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@434
 }
 
-LazyJavaClassifierType@428['Collection<? extends E>'] {
-    arguments = ArrayList@429[1] { TypeProjectionImpl@430 }
-    classifier = JavaClassImpl@431['Collection']
-    memberScope = SubstitutingScope@432
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@433
-}
-
-LazyJavaClassifierType@434['Collection<? extends E>'] {
+LazyJavaClassifierType@204['Collection<E>'] {
     arguments = ArrayList@435[1] { TypeProjectionImpl@436 }
-    classifier = JavaClassImpl@431['Collection']
-    memberScope = SubstitutingScope@437
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@438
+    classifier = JavaClassImpl@437['Collection']
+    memberScope = SubstitutingScope@438
+    typeConstructor = DeserializedClassTypeConstructor@429
 }
 
-LazyJavaClassifierType@208['Collection<E>'] {
-    arguments = ArrayList@439[1] { TypeProjectionImpl@440 }
-    classifier = JavaClassImpl@441['Collection']
-    memberScope = SubstitutingScope@442
-    typeConstructor = DeserializedClassTypeConstructor@433
+LazyJavaClassifierType@439['E'] {
+    arguments = ArrayList@440[empty]
+    classifier = JavaTypeParameterImpl@441['E']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@443['E'] {
     arguments = ArrayList@444[empty]
     classifier = JavaTypeParameterImpl@445['E']
-    nullable = 'false': Boolean@288
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@447['E'] {
     arguments = ArrayList@448[empty]
     classifier = JavaTypeParameterImpl@449['E']
-    nullable = 'false': Boolean@288
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@451['E'] {
     arguments = ArrayList@452[empty]
     classifier = JavaTypeParameterImpl@453['E']
-    nullable = 'false': Boolean@288
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@454['E'] {
     arguments = ArrayList@455[empty]
     classifier = JavaTypeParameterImpl@456['E']
-    nullable = 'false': Boolean@288
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@457['E'] {
     arguments = ArrayList@458[empty]
     classifier = JavaTypeParameterImpl@459['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@460['E'] {
     arguments = ArrayList@461[empty]
     classifier = JavaTypeParameterImpl@462['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@463['E'] {
     arguments = ArrayList@464[empty]
     classifier = JavaTypeParameterImpl@465['E']
-    nullable = 'false': Boolean@288
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@466['E'] {
     arguments = ArrayList@467[empty]
     classifier = JavaTypeParameterImpl@468['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@469['E'] {
     arguments = ArrayList@470[empty]
     classifier = JavaTypeParameterImpl@471['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@472['E'] {
     arguments = ArrayList@473[empty]
     classifier = JavaTypeParameterImpl@474['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
-LazyJavaClassifierType@476['E'] {
-    arguments = ArrayList@477[empty]
-    classifier = JavaTypeParameterImpl@478['E']
-    nullable = 'false': Boolean@288
+LazyJavaClassifierType@475['E'] {
+    arguments = ArrayList@476[empty]
+    classifier = JavaTypeParameterImpl@477['E']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+}
+
+LazyJavaClassifierType@478['E'] {
+    arguments = ArrayList@479[empty]
+    classifier = JavaTypeParameterImpl@480['E']
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
-LazyJavaClassifierType@479['E'] {
-    arguments = ArrayList@480[empty]
-    classifier = JavaTypeParameterImpl@481['E']
-    nullable = 'false': Boolean@288
+LazyJavaClassifierType@481['E'] {
+    arguments = ArrayList@482[empty]
+    classifier = JavaTypeParameterImpl@483['E']
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
-LazyJavaClassifierType@482['E'] {
-    arguments = ArrayList@483[empty]
-    classifier = JavaTypeParameterImpl@484['E']
-    nullable = 'false': Boolean@288
+LazyJavaClassifierType@484['E'] {
+    arguments = ArrayList@485[empty]
+    classifier = JavaTypeParameterImpl@486['E']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+}
+
+LazyJavaClassifierType@487['E'] {
+    arguments = ArrayList@488[empty]
+    classifier = JavaTypeParameterImpl@489['E']
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
-LazyJavaClassifierType@485['E'] {
-    arguments = ArrayList@486[empty]
-    classifier = JavaTypeParameterImpl@487['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-}
-
-LazyJavaClassifierType@488['E'] {
-    arguments = ArrayList@489[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'false': Boolean@288
+LazyJavaClassifierType@490['E'] {
+    arguments = ArrayList@491[empty]
+    classifier = JavaTypeParameterImpl@492['E']
+    nullable = 'false': Boolean@284
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
-LazyJavaClassifierType@491['E'] {
-    arguments = ArrayList@492[empty]
-    classifier = JavaTypeParameterImpl@493['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+LazyJavaClassifierType@493['E'] {
+    arguments = ArrayList@494[empty]
+    classifier = JavaTypeParameterImpl@495['E']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
-LazyJavaClassifierType@494['E'] {
-    arguments = ArrayList@495[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+LazyJavaClassifierType@496['E'] {
+    arguments = ArrayList@497[empty]
+    classifier = JavaTypeParameterImpl@441['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
-LazyJavaClassifierType@497['E'] {
-    arguments = ArrayList@498[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+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@496['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    classifier = JavaTypeParameterImpl@480['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@502['E'] {
     arguments = ArrayList@503[empty]
-    classifier = JavaTypeParameterImpl@481['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    classifier = JavaTypeParameterImpl@462['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@504['E'] {
     arguments = ArrayList@505[empty]
-    classifier = JavaTypeParameterImpl@456['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    classifier = JavaTypeParameterImpl@486['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@506['E'] {
     arguments = ArrayList@507[empty]
-    classifier = JavaTypeParameterImpl@487['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    classifier = JavaTypeParameterImpl@489['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@508['E'] {
     arguments = ArrayList@509[empty]
-    classifier = JavaTypeParameterImpl@462['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    classifier = JavaTypeParameterImpl@468['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@510['E'] {
     arguments = ArrayList@511[empty]
-    classifier = JavaTypeParameterImpl@474['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    classifier = JavaTypeParameterImpl@449['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@512['E'] {
     arguments = ArrayList@513[empty]
-    classifier = JavaTypeParameterImpl@445['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    classifier = JavaTypeParameterImpl@456['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@514['E'] {
     arguments = ArrayList@515[empty]
-    classifier = JavaTypeParameterImpl@449['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    classifier = JavaTypeParameterImpl@453['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@516['E'] {
     arguments = ArrayList@517[empty]
-    classifier = JavaTypeParameterImpl@459['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    classifier = JavaTypeParameterImpl@474['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@518['E'] {
     arguments = ArrayList@519[empty]
-    classifier = JavaTypeParameterImpl@468['E']
-    nullable = 'true': Boolean@327
+    classifier = JavaTypeParameterImpl@459['E']
+    nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@520['E'] {
     arguments = ArrayList@521[empty]
-    classifier = JavaTypeParameterImpl@465['E']
-    nullable = 'true': Boolean@327
+    classifier = JavaTypeParameterImpl@492['E']
+    nullable = 'true': Boolean@323
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@522['E'] {
     arguments = ArrayList@523[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
+    classifier = JavaTypeParameterImpl@445['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
 }
 
 LazyJavaClassifierType@524['E'] {
     arguments = ArrayList@525[empty]
-    classifier = JavaTypeParameterImpl@453['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    classifier = JavaTypeParameterImpl@495['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@526['E'] {
     arguments = ArrayList@527[empty]
-    classifier = JavaTypeParameterImpl@478['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    classifier = JavaTypeParameterImpl@477['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
 LazyJavaClassifierType@528['E'] {
     arguments = ArrayList@529[empty]
-    classifier = JavaTypeParameterImpl@493['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+    classifier = JavaTypeParameterImpl@483['E']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
 }
 
 LazyJavaClassifierType@530['E'] {
     arguments = ArrayList@531[empty]
-    classifier = JavaTypeParameterImpl@484['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
-}
-
-LazyJavaClassifierType@532['E'] {
-    arguments = ArrayList@533[empty]
-    classifier = JavaTypeParameterImpl@499['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
-}
-
-LazyJavaClassifierType@534['E'] {
-    arguments = ArrayList@535[empty]
     classifier = JavaTypeParameterImpl@471['E']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
 }
 
-LazyJavaClassifierType@252['FilterOutputStream'] {
-    arguments = ArrayList@536[empty]
-    classifier = JavaClassImpl@537['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@120
-    typeConstructor = LazyJavaClassTypeConstructor@122['FilterOutputStream']
+LazyJavaClassifierType@248['FilterOutputStream'] {
+    arguments = ArrayList@532[empty]
+    classifier = JavaClassImpl@533['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@111
+    typeConstructor = LazyJavaClassTypeConstructor@113['FilterOutputStream']
 }
 
-LazyJavaClassifierType@538['Flushable'] {
+LazyJavaClassifierType@534['Flushable'] {
     classifier = null
-    typeConstructor = TypeConstructorImpl$1@539
+    typeConstructor = TypeConstructorImpl$1@535
 }
 
-LazyJavaClassifierType@540['Iterator<E>'] {
-    arguments = ArrayList@541[1] { TypeProjectionImpl@542 }
-    classifier = JavaClassImpl@543['Iterator']
-    memberScope = SubstitutingScope@544
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@545
+LazyJavaClassifierType@536['Iterator<E>'] {
+    arguments = ArrayList@537[1] { TypeProjectionImpl@538 }
+    classifier = JavaClassImpl@539['Iterator']
+    memberScope = SubstitutingScope@540
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@541
 }
 
-LazyJavaClassifierType@546['Iterator<E>'] {
-    arguments = ArrayList@547[1] { TypeProjectionImpl@548 }
-    classifier = JavaClassImpl@549['Iterator']
-    memberScope = SubstitutingScope@550
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@545
+LazyJavaClassifierType@542['Iterator<E>'] {
+    arguments = ArrayList@543[1] { TypeProjectionImpl@544 }
+    classifier = JavaClassImpl@545['Iterator']
+    memberScope = SubstitutingScope@546
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@541
 }
 
-LazyJavaClassifierType@551['Iterator<E>'] {
-    arguments = ArrayList@552[1] { TypeProjectionImpl@553 }
-    classifier = JavaClassImpl@554['Iterator']
+LazyJavaClassifierType@547['Iterator<E>'] {
+    arguments = ArrayList@548[1] { TypeProjectionImpl@549 }
+    classifier = JavaClassImpl@550['Iterator']
+    memberScope = SubstitutingScope@551
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@541
+}
+
+LazyJavaClassifierType@552['Iterator<E>'] {
+    arguments = ArrayList@553[1] { TypeProjectionImpl@554 }
+    classifier = JavaClassImpl@539['Iterator']
     memberScope = SubstitutingScope@555
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@545
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@556
 }
 
-LazyJavaClassifierType@556['Iterator<E>'] {
-    arguments = ArrayList@557[1] { TypeProjectionImpl@558 }
-    classifier = JavaClassImpl@549['Iterator']
-    memberScope = SubstitutingScope@559
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@560
+LazyJavaClassifierType@557['Iterator<E>'] {
+    arguments = ArrayList@558[1] { TypeProjectionImpl@559 }
+    classifier = JavaClassImpl@545['Iterator']
+    memberScope = SubstitutingScope@560
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@556
 }
 
 LazyJavaClassifierType@561['Iterator<E>'] {
     arguments = ArrayList@562[1] { TypeProjectionImpl@563 }
-    classifier = JavaClassImpl@543['Iterator']
+    classifier = JavaClassImpl@550['Iterator']
     memberScope = SubstitutingScope@564
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@560
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@556
 }
 
-LazyJavaClassifierType@565['Iterator<E>'] {
-    arguments = ArrayList@566[1] { TypeProjectionImpl@567 }
-    classifier = JavaClassImpl@554['Iterator']
-    memberScope = SubstitutingScope@568
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@560
+LazyJavaClassifierType@565['K'] {
+    arguments = ArrayList@566[empty]
+    classifier = JavaTypeParameterImpl@567['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@569['K'] {
     arguments = ArrayList@570[empty]
     classifier = JavaTypeParameterImpl@571['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@573['K'] {
-    arguments = ArrayList@574[empty]
-    classifier = JavaTypeParameterImpl@575['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@572['K'] {
+    arguments = ArrayList@573[empty]
+    classifier = JavaTypeParameterImpl@574['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
 }
 
-LazyJavaClassifierType@577['K'] {
-    arguments = ArrayList@578[empty]
-    classifier = JavaTypeParameterImpl@579['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@576['K'] {
+    arguments = ArrayList@577[empty]
+    classifier = JavaTypeParameterImpl@578['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
 }
 
-LazyJavaClassifierType@580['K'] {
-    arguments = ArrayList@581[empty]
-    classifier = JavaTypeParameterImpl@582['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@579['K'] {
+    arguments = ArrayList@580[empty]
+    classifier = JavaTypeParameterImpl@581['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
 }
 
-LazyJavaClassifierType@583['K'] {
-    arguments = ArrayList@584[empty]
-    classifier = JavaTypeParameterImpl@585['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@582['K'] {
+    arguments = ArrayList@583[empty]
+    classifier = JavaTypeParameterImpl@584['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@586['K'] {
-    arguments = ArrayList@587[empty]
-    classifier = JavaTypeParameterImpl@588['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@585['K'] {
+    arguments = ArrayList@586[empty]
+    classifier = JavaTypeParameterImpl@587['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@589['K'] {
-    arguments = ArrayList@590[empty]
-    classifier = JavaTypeParameterImpl@591['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@588['K'] {
+    arguments = ArrayList@589[empty]
+    classifier = JavaTypeParameterImpl@590['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@592['K'] {
-    arguments = ArrayList@593[empty]
-    classifier = JavaTypeParameterImpl@594['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@591['K'] {
+    arguments = ArrayList@592[empty]
+    classifier = JavaTypeParameterImpl@593['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
 }
 
-LazyJavaClassifierType@595['K'] {
-    arguments = ArrayList@596[empty]
-    classifier = JavaTypeParameterImpl@597['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@594['K'] {
+    arguments = ArrayList@595[empty]
+    classifier = JavaTypeParameterImpl@596['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@598['K'] {
-    arguments = ArrayList@599[empty]
-    classifier = JavaTypeParameterImpl@600['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@597['K'] {
+    arguments = ArrayList@598[empty]
+    classifier = JavaTypeParameterImpl@599['K']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@601['K'] {
-    arguments = ArrayList@602[empty]
-    classifier = JavaTypeParameterImpl@603['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@600['K'] {
+    arguments = ArrayList@601[empty]
+    classifier = JavaTypeParameterImpl@593['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+}
+
+LazyJavaClassifierType@602['K'] {
+    arguments = ArrayList@603[empty]
+    classifier = JavaTypeParameterImpl@567['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@604['K'] {
     arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@606['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    classifier = JavaTypeParameterImpl@581['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
 }
 
-LazyJavaClassifierType@607['K'] {
-    arguments = ArrayList@608[empty]
-    classifier = JavaTypeParameterImpl@609['K']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@606['K'] {
+    arguments = ArrayList@607[empty]
+    classifier = JavaTypeParameterImpl@596['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+}
+
+LazyJavaClassifierType@608['K'] {
+    arguments = ArrayList@609[empty]
+    classifier = JavaTypeParameterImpl@574['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
 }
 
 LazyJavaClassifierType@610['K'] {
     arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@582['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    classifier = JavaTypeParameterImpl@584['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@612['K'] {
     arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@597['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    classifier = JavaTypeParameterImpl@578['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
 }
 
 LazyJavaClassifierType@614['K'] {
     arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@609['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+    classifier = JavaTypeParameterImpl@599['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@616['K'] {
     arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@594['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+    classifier = JavaTypeParameterImpl@571['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@618['K'] {
     arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@588['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    classifier = JavaTypeParameterImpl@587['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
 LazyJavaClassifierType@620['K'] {
     arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@603['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+    classifier = JavaTypeParameterImpl@590['K']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
 }
 
-LazyJavaClassifierType@622['K'] {
-    arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@600['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@209['List<E>'] {
+    arguments = ArrayList@622[1] { TypeProjectionImpl@623 }
+    classifier = JavaClassImpl@624['List']
+    memberScope = SubstitutingScope@625
+    typeConstructor = DeserializedClassTypeConstructor@626
 }
 
-LazyJavaClassifierType@624['K'] {
-    arguments = ArrayList@625[empty]
-    classifier = JavaTypeParameterImpl@585['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@226['List<E>'] {
+    arguments = ArrayList@627[1] { TypeProjectionImpl@628 }
+    classifier = JavaClassImpl@629['List']
+    memberScope = SubstitutingScope@630
+    typeConstructor = DeserializedClassTypeConstructor@626
 }
 
-LazyJavaClassifierType@626['K'] {
-    arguments = ArrayList@627[empty]
-    classifier = JavaTypeParameterImpl@575['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@631['Map<? extends K, ? extends V>'] {
+    arguments = ArrayList@632[2] { TypeProjectionImpl@633, TypeProjectionImpl@634 }
+    classifier = JavaClassImpl@635['Map']
+    memberScope = SubstitutingScope@636
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@637
 }
 
-LazyJavaClassifierType@628['K'] {
-    arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@606['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@638['Map<? extends K, ? extends V>'] {
+    arguments = ArrayList@639[2] { TypeProjectionImpl@640, TypeProjectionImpl@641 }
+    classifier = JavaClassImpl@635['Map']
+    memberScope = SubstitutingScope@642
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@643
 }
 
-LazyJavaClassifierType@630['K'] {
-    arguments = ArrayList@631[empty]
-    classifier = JavaTypeParameterImpl@591['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@214['Map<K, V>'] {
+    arguments = ArrayList@644[2] { TypeProjectionImpl@645, TypeProjectionImpl@646 }
+    classifier = JavaClassImpl@647['Map']
+    memberScope = SubstitutingScope@648
+    typeConstructor = DeserializedClassTypeConstructor@637
 }
 
-LazyJavaClassifierType@632['K'] {
-    arguments = ArrayList@633[empty]
-    classifier = JavaTypeParameterImpl@579['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+LazyJavaClassifierType@241['Map<K, V>'] {
+    arguments = ArrayList@649[2] { TypeProjectionImpl@650, TypeProjectionImpl@651 }
+    classifier = JavaClassImpl@652['Map']
+    memberScope = SubstitutingScope@653
+    typeConstructor = DeserializedClassTypeConstructor@637
 }
 
-LazyJavaClassifierType@634['K'] {
-    arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@571['K']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
+LazyJavaClassifierType@654['Object'] {
+    arguments = ArrayList@655[empty]
+    classifier = JavaClassImpl@656['Object']
+    memberScope = DeserializedClassMemberScope@657
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@230['List<E>'] {
-    arguments = ArrayList@636[1] { TypeProjectionImpl@637 }
-    classifier = JavaClassImpl@638['List']
-    memberScope = SubstitutingScope@639
-    typeConstructor = DeserializedClassTypeConstructor@640
+LazyJavaClassifierType@659['Object'] {
+    arguments = ArrayList@660[empty]
+    classifier = JavaClassImpl@661['Object']
+    memberScope = DeserializedClassMemberScope@657
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@213['List<E>'] {
-    arguments = ArrayList@641[1] { TypeProjectionImpl@642 }
-    classifier = JavaClassImpl@643['List']
-    memberScope = SubstitutingScope@644
-    typeConstructor = DeserializedClassTypeConstructor@640
+LazyJavaClassifierType@662['Object'] {
+    arguments = ArrayList@663[empty]
+    classifier = JavaClassImpl@661['Object']
+    memberScope = DeserializedClassMemberScope@657
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@645['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@646[2] { TypeProjectionImpl@647, TypeProjectionImpl@648 }
-    classifier = JavaClassImpl@649['Map']
-    memberScope = SubstitutingScope@650
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@651
+LazyJavaClassifierType@664['Object'] {
+    arguments = ArrayList@665[empty]
+    classifier = JavaClassImpl@656['Object']
+    memberScope = DeserializedClassMemberScope@657
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@652['Map<? extends K, ? extends V>'] {
-    arguments = ArrayList@653[2] { TypeProjectionImpl@654, TypeProjectionImpl@655 }
-    classifier = JavaClassImpl@649['Map']
-    memberScope = SubstitutingScope@656
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@657
+LazyJavaClassifierType@666['Object'] {
+    arguments = ArrayList@667[empty]
+    classifier = JavaClassImpl@668['Object']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@218['Map<K, V>'] {
-    arguments = ArrayList@658[2] { TypeProjectionImpl@659, TypeProjectionImpl@660 }
-    classifier = JavaClassImpl@661['Map']
-    memberScope = SubstitutingScope@662
-    typeConstructor = DeserializedClassTypeConstructor@651
+LazyJavaClassifierType@669['Object'] {
+    arguments = ArrayList@670[empty]
+    classifier = JavaClassImpl@671['Object']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@245['Map<K, V>'] {
-    arguments = ArrayList@663[2] { TypeProjectionImpl@664, TypeProjectionImpl@665 }
-    classifier = JavaClassImpl@666['Map']
-    memberScope = SubstitutingScope@667
-    typeConstructor = DeserializedClassTypeConstructor@651
+LazyJavaClassifierType@672['Object'] {
+    arguments = ArrayList@673[empty]
+    classifier = JavaClassImpl@674['Object']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@668['Object'] {
-    arguments = ArrayList@669[empty]
-    classifier = JavaClassImpl@670['Object']
-    memberScope = DeserializedClassMemberScope@671
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@672
-}
-
-LazyJavaClassifierType@673['Object'] {
-    arguments = ArrayList@674[empty]
-    classifier = JavaClassImpl@675['Object']
-    memberScope = DeserializedClassMemberScope@671
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@672
-}
-
-LazyJavaClassifierType@676['Object'] {
-    arguments = ArrayList@677[empty]
-    classifier = JavaClassImpl@675['Object']
-    memberScope = DeserializedClassMemberScope@671
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@675['Object'] {
+    arguments = ArrayList@676[empty]
+    classifier = JavaClassImpl@677['Object']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@678['Object'] {
     arguments = ArrayList@679[empty]
-    classifier = JavaClassImpl@670['Object']
-    memberScope = DeserializedClassMemberScope@671
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@672
+    classifier = JavaClassImpl@671['Object']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@680['Object'] {
     arguments = ArrayList@681[empty]
-    classifier = JavaClassImpl@682['Object']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@672
+    classifier = JavaClassImpl@668['Object']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@683['Object'] {
-    arguments = ArrayList@684[empty]
-    classifier = JavaClassImpl@685['Object']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@682['Object'] {
+    arguments = ArrayList@683[empty]
+    classifier = JavaClassImpl@677['Object']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@658
+}
+
+LazyJavaClassifierType@684['Object'] {
+    arguments = ArrayList@685[empty]
+    classifier = JavaClassImpl@674['Object']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@686['Object'] {
-    arguments = ArrayList@687[empty]
-    classifier = JavaClassImpl@688['Object']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@672
+    classifier = JavaClassImpl@687['Object']
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@689['Object'] {
-    arguments = ArrayList@690[empty]
+LazyJavaClassifierType@688['Object'] {
+    classifier = JavaClassImpl@689['Object']
+    typeConstructor = DeserializedClassTypeConstructor@658
+}
+
+LazyJavaClassifierType@690['Object'] {
     classifier = JavaClassImpl@691['Object']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@672
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@692['Object'] {
-    arguments = ArrayList@693[empty]
-    classifier = JavaClassImpl@688['Object']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@672
+    classifier = JavaClassImpl@693['Object']
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@694['Object'] {
-    arguments = ArrayList@695[empty]
-    classifier = JavaClassImpl@685['Object']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@672
+    classifier = JavaClassImpl@695['Object']
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@696['Object'] {
-    arguments = ArrayList@697[empty]
-    classifier = JavaClassImpl@682['Object']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@672
+    classifier = JavaClassImpl@697['Object']
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@698['Object'] {
-    arguments = ArrayList@699[empty]
-    classifier = JavaClassImpl@691['Object']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@672
+    classifier = JavaClassImpl@699['Object']
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@700['Object'] {
     classifier = JavaClassImpl@701['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
 LazyJavaClassifierType@702['Object'] {
     classifier = JavaClassImpl@703['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+    typeConstructor = DeserializedClassTypeConstructor@658
 }
 
-LazyJavaClassifierType@704['Object'] {
-    classifier = JavaClassImpl@705['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@235['OutputStream'] {
+    arguments = ArrayList@704[empty]
+    classifier = JavaClassImpl@705['OutputStream']
+    memberScope = LazyJavaClassMemberScope@136
+    typeConstructor = LazyJavaClassTypeConstructor@138['OutputStream']
 }
 
-LazyJavaClassifierType@706['Object'] {
-    classifier = JavaClassImpl@707['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@706['PrintStream'] {
+    arguments = ArrayList@707[empty]
+    classifier = JavaClassImpl@708['PrintStream']
+    memberScope = LazyJavaClassMemberScope@142
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@156['PrintStream']
 }
 
-LazyJavaClassifierType@708['Object'] {
-    classifier = JavaClassImpl@709['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@709['PrintStream'] {
+    arguments = ArrayList@710[empty]
+    classifier = JavaClassImpl@708['PrintStream']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@156['PrintStream']
 }
 
-LazyJavaClassifierType@710['Object'] {
-    classifier = JavaClassImpl@711['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@227['RandomAccess'] {
+    arguments = ArrayList@711[empty]
+    classifier = JavaClassImpl@712['RandomAccess']
+    memberScope = LazyJavaClassMemberScope@158
+    typeConstructor = LazyJavaClassTypeConstructor@160['RandomAccess']
 }
 
-LazyJavaClassifierType@712['Object'] {
-    classifier = JavaClassImpl@713['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@713['Serializable'] {
+    arguments = ArrayList@714[empty]
+    classifier = JavaClassImpl@715['Serializable']
+    memberScope = LazyJavaClassMemberScope@163
+    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
 }
 
-LazyJavaClassifierType@714['Object'] {
-    classifier = JavaClassImpl@715['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@263['Serializable'] {
+    arguments = ArrayList@716[empty]
+    classifier = JavaClassImpl@717['Serializable']
+    memberScope = LazyJavaClassMemberScope@163
+    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
 }
 
-LazyJavaClassifierType@716['Object'] {
-    classifier = JavaClassImpl@717['Object']
-    typeConstructor = DeserializedClassTypeConstructor@672
+LazyJavaClassifierType@718['Serializable'] {
+    arguments = ArrayList@719[empty]
+    classifier = JavaClassImpl@720['Serializable']
+    memberScope = LazyJavaClassMemberScope@163
+    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
 }
 
-LazyJavaClassifierType@239['OutputStream'] {
-    arguments = ArrayList@718[empty]
-    classifier = JavaClassImpl@719['OutputStream']
-    memberScope = LazyJavaClassMemberScope@144
-    typeConstructor = LazyJavaClassTypeConstructor@146['OutputStream']
+LazyJavaClassifierType@258['Serializable'] {
+    classifier = JavaClassImpl@721['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@167['Serializable']
 }
 
-LazyJavaClassifierType@720['PrintStream'] {
-    arguments = ArrayList@721[empty]
-    classifier = JavaClassImpl@722['PrintStream']
-    memberScope = LazyJavaClassMemberScope@150
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@162['PrintStream']
+LazyJavaClassifierType@722['Set<K>'] {
+    arguments = ArrayList@723[1] { TypeProjectionImpl@724 }
+    classifier = JavaClassImpl@725['Set']
+    memberScope = SubstitutingScope@726
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@727
 }
 
-LazyJavaClassifierType@723['PrintStream'] {
-    arguments = ArrayList@724[empty]
-    classifier = JavaClassImpl@722['PrintStream']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@162['PrintStream']
+LazyJavaClassifierType@728['Set<K>'] {
+    arguments = ArrayList@729[1] { TypeProjectionImpl@730 }
+    classifier = JavaClassImpl@731['Set']
+    memberScope = SubstitutingScope@732
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@727
 }
 
-LazyJavaClassifierType@231['RandomAccess'] {
-    arguments = ArrayList@725[empty]
-    classifier = JavaClassImpl@726['RandomAccess']
-    memberScope = LazyJavaClassMemberScope@164
-    typeConstructor = LazyJavaClassTypeConstructor@166['RandomAccess']
+LazyJavaClassifierType@733['Set<K>'] {
+    arguments = ArrayList@734[1] { TypeProjectionImpl@735 }
+    classifier = JavaClassImpl@731['Set']
+    memberScope = SubstitutingScope@736
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@737
 }
 
-LazyJavaClassifierType@267['Serializable'] {
-    arguments = ArrayList@727[empty]
-    classifier = JavaClassImpl@728['Serializable']
-    memberScope = LazyJavaClassMemberScope@169
-    typeConstructor = LazyJavaClassTypeConstructor@173['Serializable']
+LazyJavaClassifierType@738['Set<K>'] {
+    arguments = ArrayList@739[1] { TypeProjectionImpl@740 }
+    classifier = JavaClassImpl@725['Set']
+    memberScope = SubstitutingScope@741
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@737
 }
 
-LazyJavaClassifierType@729['Serializable'] {
-    arguments = ArrayList@730[empty]
-    classifier = JavaClassImpl@731['Serializable']
-    memberScope = LazyJavaClassMemberScope@169
-    typeConstructor = LazyJavaClassTypeConstructor@173['Serializable']
+LazyJavaClassifierType@742['String'] {
+    arguments = ArrayList@743[empty]
+    classifier = JavaClassImpl@744['String']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@732['Serializable'] {
-    arguments = ArrayList@733[empty]
-    classifier = JavaClassImpl@734['Serializable']
-    memberScope = LazyJavaClassMemberScope@169
-    typeConstructor = LazyJavaClassTypeConstructor@173['Serializable']
+LazyJavaClassifierType@746['String'] {
+    arguments = ArrayList@747[empty]
+    classifier = JavaClassImpl@748['String']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@262['Serializable'] {
-    classifier = JavaClassImpl@735['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@173['Serializable']
+LazyJavaClassifierType@749['String'] {
+    arguments = ArrayList@750[empty]
+    classifier = JavaClassImpl@751['String']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@736['Set<K>'] {
-    arguments = ArrayList@737[1] { TypeProjectionImpl@738 }
-    classifier = JavaClassImpl@739['Set']
-    memberScope = SubstitutingScope@740
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@741
+LazyJavaClassifierType@752['String'] {
+    arguments = ArrayList@753[empty]
+    classifier = JavaClassImpl@754['String']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@742['Set<K>'] {
-    arguments = ArrayList@743[1] { TypeProjectionImpl@744 }
-    classifier = JavaClassImpl@745['Set']
-    memberScope = SubstitutingScope@746
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@741
+LazyJavaClassifierType@755['String'] {
+    arguments = ArrayList@756[empty]
+    classifier = JavaClassImpl@757['String']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@747['Set<K>'] {
-    arguments = ArrayList@748[1] { TypeProjectionImpl@749 }
-    classifier = JavaClassImpl@750['Set']
-    memberScope = SubstitutingScope@751
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@741
+LazyJavaClassifierType@758['String'] {
+    arguments = ArrayList@759[empty]
+    classifier = JavaClassImpl@760['String']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@752['Set<K>'] {
-    arguments = ArrayList@753[1] { TypeProjectionImpl@754 }
-    classifier = JavaClassImpl@739['Set']
-    memberScope = SubstitutingScope@755
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@756
+LazyJavaClassifierType@761['String'] {
+    arguments = ArrayList@762[empty]
+    classifier = JavaClassImpl@763['String']
+    nullable = 'false': Boolean@284
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@757['Set<K>'] {
-    arguments = ArrayList@758[1] { TypeProjectionImpl@759 }
-    classifier = JavaClassImpl@750['Set']
-    memberScope = SubstitutingScope@760
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@756
+LazyJavaClassifierType@764['String'] {
+    arguments = ArrayList@765[empty]
+    classifier = JavaClassImpl@763['String']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@761['Set<K>'] {
-    arguments = ArrayList@762[1] { TypeProjectionImpl@763 }
-    classifier = JavaClassImpl@745['Set']
-    memberScope = SubstitutingScope@764
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@756
+LazyJavaClassifierType@766['String'] {
+    arguments = ArrayList@767[empty]
+    classifier = JavaClassImpl@760['String']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@765['String'] {
-    arguments = ArrayList@766[empty]
-    classifier = JavaClassImpl@767['String']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@768
+LazyJavaClassifierType@768['String'] {
+    arguments = ArrayList@769[empty]
+    classifier = JavaClassImpl@754['String']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@769['String'] {
-    arguments = ArrayList@770[empty]
-    classifier = JavaClassImpl@771['String']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@768
+LazyJavaClassifierType@770['String'] {
+    arguments = ArrayList@771[empty]
+    classifier = JavaClassImpl@751['String']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
 LazyJavaClassifierType@772['String'] {
     arguments = ArrayList@773[empty]
-    classifier = JavaClassImpl@774['String']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@768
+    classifier = JavaClassImpl@744['String']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@775['String'] {
-    arguments = ArrayList@776[empty]
-    classifier = JavaClassImpl@777['String']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@768
+LazyJavaClassifierType@774['String'] {
+    arguments = ArrayList@775[empty]
+    classifier = JavaClassImpl@757['String']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@745
 }
 
-LazyJavaClassifierType@778['String'] {
+LazyJavaClassifierType@776['String'] {
+    arguments = ArrayList@777[empty]
+    classifier = JavaClassImpl@748['String']
+    nullable = 'true': Boolean@323
+    typeConstructor = DeserializedClassTypeConstructor@745
+}
+
+LazyJavaClassifierType@778['StringBuffer'] {
     arguments = ArrayList@779[empty]
-    classifier = JavaClassImpl@780['String']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@768
+    classifier = JavaClassImpl@780['StringBuffer']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
 }
 
-LazyJavaClassifierType@781['String'] {
+LazyJavaClassifierType@781['StringBuffer'] {
     arguments = ArrayList@782[empty]
-    classifier = JavaClassImpl@783['String']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@768
+    classifier = JavaClassImpl@783['StringBuffer']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
 }
 
-LazyJavaClassifierType@784['String'] {
+LazyJavaClassifierType@784['StringBuffer'] {
     arguments = ArrayList@785[empty]
-    classifier = JavaClassImpl@786['String']
-    nullable = 'false': Boolean@288
-    typeConstructor = DeserializedClassTypeConstructor@768
+    classifier = JavaClassImpl@780['StringBuffer']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
 }
 
-LazyJavaClassifierType@787['String'] {
-    arguments = ArrayList@788[empty]
-    classifier = JavaClassImpl@777['String']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@768
+LazyJavaClassifierType@786['StringBuffer'] {
+    arguments = ArrayList@787[empty]
+    classifier = JavaClassImpl@783['StringBuffer']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@169['StringBuffer']
 }
 
-LazyJavaClassifierType@789['String'] {
-    arguments = ArrayList@790[empty]
-    classifier = JavaClassImpl@774['String']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@768
+LazyJavaClassifierType@788['StringBuilder'] {
+    arguments = ArrayList@789[empty]
+    classifier = JavaClassImpl@790['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@791['String'] {
+LazyJavaClassifierType@791['StringBuilder'] {
     arguments = ArrayList@792[empty]
-    classifier = JavaClassImpl@786['String']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@768
+    classifier = JavaClassImpl@793['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@793['String'] {
-    arguments = ArrayList@794[empty]
-    classifier = JavaClassImpl@771['String']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@768
+LazyJavaClassifierType@794['StringBuilder'] {
+    arguments = ArrayList@795[empty]
+    classifier = JavaClassImpl@796['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@795['String'] {
-    arguments = ArrayList@796[empty]
-    classifier = JavaClassImpl@783['String']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@768
-}
-
-LazyJavaClassifierType@797['String'] {
+LazyJavaClassifierType@797['StringBuilder'] {
     arguments = ArrayList@798[empty]
-    classifier = JavaClassImpl@767['String']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@768
+    classifier = JavaClassImpl@799['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@799['String'] {
-    arguments = ArrayList@800[empty]
-    classifier = JavaClassImpl@780['String']
-    nullable = 'true': Boolean@327
-    typeConstructor = DeserializedClassTypeConstructor@768
+LazyJavaClassifierType@800['StringBuilder'] {
+    arguments = ArrayList@801[empty]
+    classifier = JavaClassImpl@802['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@801['StringBuffer'] {
-    arguments = ArrayList@802[empty]
-    classifier = JavaClassImpl@803['StringBuffer']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@175['StringBuffer']
+LazyJavaClassifierType@803['StringBuilder'] {
+    arguments = ArrayList@804[empty]
+    classifier = JavaClassImpl@805['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@804['StringBuffer'] {
-    arguments = ArrayList@805[empty]
-    classifier = JavaClassImpl@806['StringBuffer']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@175['StringBuffer']
+LazyJavaClassifierType@806['StringBuilder'] {
+    arguments = ArrayList@807[empty]
+    classifier = JavaClassImpl@808['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@807['StringBuffer'] {
-    arguments = ArrayList@808[empty]
-    classifier = JavaClassImpl@806['StringBuffer']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@175['StringBuffer']
-}
-
-LazyJavaClassifierType@809['StringBuffer'] {
+LazyJavaClassifierType@809['StringBuilder'] {
     arguments = ArrayList@810[empty]
-    classifier = JavaClassImpl@803['StringBuffer']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@175['StringBuffer']
+    classifier = JavaClassImpl@811['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@811['StringBuilder'] {
-    arguments = ArrayList@812[empty]
-    classifier = JavaClassImpl@813['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@812['StringBuilder'] {
+    arguments = ArrayList@813[empty]
+    classifier = JavaClassImpl@814['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@814['StringBuilder'] {
-    arguments = ArrayList@815[empty]
-    classifier = JavaClassImpl@816['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@815['StringBuilder'] {
+    arguments = ArrayList@816[empty]
+    classifier = JavaClassImpl@817['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@817['StringBuilder'] {
-    arguments = ArrayList@818[empty]
-    classifier = JavaClassImpl@819['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@818['StringBuilder'] {
+    arguments = ArrayList@819[empty]
+    classifier = JavaClassImpl@820['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@820['StringBuilder'] {
-    arguments = ArrayList@821[empty]
-    classifier = JavaClassImpl@822['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@821['StringBuilder'] {
+    arguments = ArrayList@822[empty]
+    classifier = JavaClassImpl@823['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@823['StringBuilder'] {
-    arguments = ArrayList@824[empty]
-    classifier = JavaClassImpl@825['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@824['StringBuilder'] {
+    arguments = ArrayList@825[empty]
+    classifier = JavaClassImpl@826['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@826['StringBuilder'] {
-    arguments = ArrayList@827[empty]
-    classifier = JavaClassImpl@828['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@827['StringBuilder'] {
+    arguments = ArrayList@828[empty]
+    classifier = JavaClassImpl@829['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@829['StringBuilder'] {
-    arguments = ArrayList@830[empty]
-    classifier = JavaClassImpl@831['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@830['StringBuilder'] {
+    arguments = ArrayList@831[empty]
+    classifier = JavaClassImpl@832['StringBuilder']
+    nullable = 'false': Boolean@284
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@832['StringBuilder'] {
-    arguments = ArrayList@833[empty]
-    classifier = JavaClassImpl@834['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@833['StringBuilder'] {
+    arguments = ArrayList@834[empty]
+    classifier = JavaClassImpl@796['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@835['StringBuilder'] {
     arguments = ArrayList@836[empty]
-    classifier = JavaClassImpl@837['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+    classifier = JavaClassImpl@814['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@838['StringBuilder'] {
-    arguments = ArrayList@839[empty]
-    classifier = JavaClassImpl@840['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@837['StringBuilder'] {
+    arguments = ArrayList@838[empty]
+    classifier = JavaClassImpl@790['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
+}
+
+LazyJavaClassifierType@839['StringBuilder'] {
+    arguments = ArrayList@840[empty]
+    classifier = JavaClassImpl@802['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@841['StringBuilder'] {
     arguments = ArrayList@842[empty]
-    classifier = JavaClassImpl@843['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+    classifier = JavaClassImpl@805['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@844['StringBuilder'] {
-    arguments = ArrayList@845[empty]
-    classifier = JavaClassImpl@846['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@843['StringBuilder'] {
+    arguments = ArrayList@844[empty]
+    classifier = JavaClassImpl@808['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
+}
+
+LazyJavaClassifierType@845['StringBuilder'] {
+    arguments = ArrayList@846[empty]
+    classifier = JavaClassImpl@829['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@847['StringBuilder'] {
     arguments = ArrayList@848[empty]
-    classifier = JavaClassImpl@849['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+    classifier = JavaClassImpl@826['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@850['StringBuilder'] {
-    arguments = ArrayList@851[empty]
-    classifier = JavaClassImpl@852['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@849['StringBuilder'] {
+    arguments = ArrayList@850[empty]
+    classifier = JavaClassImpl@820['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
+}
+
+LazyJavaClassifierType@851['StringBuilder'] {
+    arguments = ArrayList@852[empty]
+    classifier = JavaClassImpl@823['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
 LazyJavaClassifierType@853['StringBuilder'] {
     arguments = ArrayList@854[empty]
-    classifier = JavaClassImpl@855['StringBuilder']
-    nullable = 'false': Boolean@288
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+    classifier = JavaClassImpl@799['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@856['StringBuilder'] {
-    arguments = ArrayList@857[empty]
-    classifier = JavaClassImpl@855['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@855['StringBuilder'] {
+    arguments = ArrayList@856[empty]
+    classifier = JavaClassImpl@793['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@858['StringBuilder'] {
-    arguments = ArrayList@859[empty]
-    classifier = JavaClassImpl@825['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@857['StringBuilder'] {
+    arguments = ArrayList@858[empty]
+    classifier = JavaClassImpl@832['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@860['StringBuilder'] {
-    arguments = ArrayList@861[empty]
-    classifier = JavaClassImpl@840['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@859['StringBuilder'] {
+    arguments = ArrayList@860[empty]
+    classifier = JavaClassImpl@817['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@862['StringBuilder'] {
-    arguments = ArrayList@863[empty]
-    classifier = JavaClassImpl@828['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@861['StringBuilder'] {
+    arguments = ArrayList@862[empty]
+    classifier = JavaClassImpl@811['StringBuilder']
+    nullable = 'true': Boolean@323
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuilder']
 }
 
-LazyJavaClassifierType@864['StringBuilder'] {
-    arguments = ArrayList@865[empty]
-    classifier = JavaClassImpl@831['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@863['V'] {
+    arguments = ArrayList@864[empty]
+    classifier = JavaTypeParameterImpl@865['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
-LazyJavaClassifierType@866['StringBuilder'] {
-    arguments = ArrayList@867[empty]
-    classifier = JavaClassImpl@816['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@867['V'] {
+    arguments = ArrayList@868[empty]
+    classifier = JavaTypeParameterImpl@869['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
-LazyJavaClassifierType@868['StringBuilder'] {
-    arguments = ArrayList@869[empty]
-    classifier = JavaClassImpl@846['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@871['V'] {
+    arguments = ArrayList@872[empty]
+    classifier = JavaTypeParameterImpl@873['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
-LazyJavaClassifierType@870['StringBuilder'] {
-    arguments = ArrayList@871[empty]
-    classifier = JavaClassImpl@822['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
-}
-
-LazyJavaClassifierType@872['StringBuilder'] {
-    arguments = ArrayList@873[empty]
-    classifier = JavaClassImpl@837['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
-}
-
-LazyJavaClassifierType@874['StringBuilder'] {
+LazyJavaClassifierType@874['V'] {
     arguments = ArrayList@875[empty]
-    classifier = JavaClassImpl@852['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+    classifier = JavaTypeParameterImpl@876['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
-LazyJavaClassifierType@876['StringBuilder'] {
-    arguments = ArrayList@877[empty]
-    classifier = JavaClassImpl@849['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@877['V'] {
+    arguments = ArrayList@878[empty]
+    classifier = JavaTypeParameterImpl@879['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
-LazyJavaClassifierType@878['StringBuilder'] {
-    arguments = ArrayList@879[empty]
-    classifier = JavaClassImpl@834['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
-}
-
-LazyJavaClassifierType@880['StringBuilder'] {
+LazyJavaClassifierType@880['V'] {
     arguments = ArrayList@881[empty]
-    classifier = JavaClassImpl@819['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+    classifier = JavaTypeParameterImpl@882['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
-LazyJavaClassifierType@882['StringBuilder'] {
-    arguments = ArrayList@883[empty]
-    classifier = JavaClassImpl@813['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
-}
-
-LazyJavaClassifierType@884['StringBuilder'] {
-    arguments = ArrayList@885[empty]
-    classifier = JavaClassImpl@843['StringBuilder']
-    nullable = 'true': Boolean@327
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuilder']
+LazyJavaClassifierType@883['V'] {
+    arguments = ArrayList@884[empty]
+    classifier = JavaTypeParameterImpl@885['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@886['V'] {
     arguments = ArrayList@887[empty]
     classifier = JavaTypeParameterImpl@888['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
-LazyJavaClassifierType@890['V'] {
-    arguments = ArrayList@891[empty]
-    classifier = JavaTypeParameterImpl@892['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+LazyJavaClassifierType@889['V'] {
+    arguments = ArrayList@890[empty]
+    classifier = JavaTypeParameterImpl@891['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
-LazyJavaClassifierType@893['V'] {
-    arguments = ArrayList@894[empty]
-    classifier = JavaTypeParameterImpl@895['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+LazyJavaClassifierType@892['V'] {
+    arguments = ArrayList@893[empty]
+    classifier = JavaTypeParameterImpl@894['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
-LazyJavaClassifierType@896['V'] {
-    arguments = ArrayList@897[empty]
-    classifier = JavaTypeParameterImpl@898['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
+LazyJavaClassifierType@895['V'] {
+    arguments = ArrayList@896[empty]
+    classifier = JavaTypeParameterImpl@897['V']
+    nullable = 'false': Boolean@284
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+}
+
+LazyJavaClassifierType@898['V'] {
+    arguments = ArrayList@899[empty]
+    classifier = JavaTypeParameterImpl@885['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@900['V'] {
     arguments = ArrayList@901[empty]
-    classifier = JavaTypeParameterImpl@902['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+    classifier = JavaTypeParameterImpl@894['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
-LazyJavaClassifierType@903['V'] {
-    arguments = ArrayList@904[empty]
-    classifier = JavaTypeParameterImpl@905['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+LazyJavaClassifierType@902['V'] {
+    arguments = ArrayList@903[empty]
+    classifier = JavaTypeParameterImpl@897['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+}
+
+LazyJavaClassifierType@904['V'] {
+    arguments = ArrayList@905[empty]
+    classifier = JavaTypeParameterImpl@869['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@906['V'] {
     arguments = ArrayList@907[empty]
-    classifier = JavaTypeParameterImpl@908['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+    classifier = JavaTypeParameterImpl@882['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
-LazyJavaClassifierType@909['V'] {
-    arguments = ArrayList@910[empty]
-    classifier = JavaTypeParameterImpl@911['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
+LazyJavaClassifierType@908['V'] {
+    arguments = ArrayList@909[empty]
+    classifier = JavaTypeParameterImpl@873['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+}
+
+LazyJavaClassifierType@910['V'] {
+    arguments = ArrayList@911[empty]
+    classifier = JavaTypeParameterImpl@888['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
 LazyJavaClassifierType@912['V'] {
     arguments = ArrayList@913[empty]
-    classifier = JavaTypeParameterImpl@914['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
+    classifier = JavaTypeParameterImpl@876['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
 }
 
-LazyJavaClassifierType@915['V'] {
-    arguments = ArrayList@916[empty]
-    classifier = JavaTypeParameterImpl@917['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+LazyJavaClassifierType@914['V'] {
+    arguments = ArrayList@915[empty]
+    classifier = JavaTypeParameterImpl@891['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
+}
+
+LazyJavaClassifierType@916['V'] {
+    arguments = ArrayList@917[empty]
+    classifier = JavaTypeParameterImpl@865['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
 LazyJavaClassifierType@918['V'] {
     arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@920['V']
-    nullable = 'false': Boolean@288
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
+    classifier = JavaTypeParameterImpl@879['V']
+    nullable = 'true': Boolean@323
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
 }
 
-LazyJavaClassifierType@921['V'] {
-    arguments = ArrayList@922[empty]
-    classifier = JavaTypeParameterImpl@908['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+LazyJavaPackageFragmentProvider@920 {
+    packageFragments('<root>': FqName@921) = LazyJavaPackageFragment@922['<root>']
+    packageFragments('A': FqName@923) = null
+    packageFragments('Any': FqName@924) = null
+    packageFragments('Array': FqName@925) = null
+    packageFragments('B': FqName@926) = null
+    packageFragments('Body': FqName@927) = null
+    packageFragments('BodyTag': FqName@928) = null
+    packageFragments('Element': FqName@929) = null
+    packageFragments('H1': FqName@930) = null
+    packageFragments('HTML': FqName@931) = null
+    packageFragments('Head': FqName@932) = null
+    packageFragments('K': FqName@933) = null
+    packageFragments('LI': FqName@934) = null
+    packageFragments('MutableMap': FqName@935) = null
+    packageFragments('P': FqName@936) = null
+    packageFragments('String': FqName@937) = null
+    packageFragments('StringBuilder': FqName@938) = null
+    packageFragments('System': FqName@939) = null
+    packageFragments('T': FqName@940) = null
+    packageFragments('Tag': FqName@941) = null
+    packageFragments('TagWithText': FqName@942) = null
+    packageFragments('Title': FqName@943) = null
+    packageFragments('UL': FqName@944) = null
+    packageFragments('Unit': FqName@945) = null
+    packageFragments('V': FqName@946) = null
+    packageFragments('html': FqName@947) = null
+    packageFragments('html.A': FqName@948) = null
+    packageFragments('html.Any': FqName@949) = null
+    packageFragments('html.Array': FqName@950) = null
+    packageFragments('html.B': FqName@951) = null
+    packageFragments('html.Body': FqName@952) = null
+    packageFragments('html.BodyTag': FqName@953) = null
+    packageFragments('html.Element': FqName@954) = null
+    packageFragments('html.H1': FqName@955) = null
+    packageFragments('html.HTML': FqName@956) = null
+    packageFragments('html.Head': FqName@957) = null
+    packageFragments('html.K': FqName@958) = null
+    packageFragments('html.LI': FqName@959) = null
+    packageFragments('html.MutableMap': FqName@960) = null
+    packageFragments('html.P': FqName@961) = null
+    packageFragments('html.String': FqName@962) = null
+    packageFragments('html.StringBuilder': FqName@963) = null
+    packageFragments('html.System': FqName@964) = null
+    packageFragments('html.T': FqName@965) = null
+    packageFragments('html.Tag': FqName@966) = null
+    packageFragments('html.TagWithText': FqName@967) = null
+    packageFragments('html.TextElement': FqName@968) = null
+    packageFragments('html.Title': FqName@969) = null
+    packageFragments('html.UL': FqName@970) = null
+    packageFragments('html.Unit': FqName@971) = null
+    packageFragments('html.V': FqName@972) = null
+    packageFragments('java': FqName@973) = LazyJavaPackageFragment@974['java']
+    packageFragments('java.io': FqName@975) = LazyJavaPackageFragment@976['io']
+    packageFragments('java.lang': FqName@977) = LazyJavaPackageFragment@978['lang']
+    packageFragments('java.lang.A': FqName@979) = null
+    packageFragments('java.lang.Any': FqName@980) = null
+    packageFragments('java.lang.Array': FqName@981) = null
+    packageFragments('java.lang.B': FqName@982) = null
+    packageFragments('java.lang.Body': FqName@983) = null
+    packageFragments('java.lang.BodyTag': FqName@984) = null
+    packageFragments('java.lang.Element': FqName@985) = null
+    packageFragments('java.lang.H1': FqName@986) = null
+    packageFragments('java.lang.HTML': FqName@987) = null
+    packageFragments('java.lang.Head': FqName@988) = null
+    packageFragments('java.lang.K': FqName@989) = null
+    packageFragments('java.lang.LI': FqName@990) = null
+    packageFragments('java.lang.MutableMap': FqName@991) = null
+    packageFragments('java.lang.P': FqName@992) = null
+    packageFragments('java.lang.String': FqName@993) = null
+    packageFragments('java.lang.StringBuilder': FqName@994) = null
+    packageFragments('java.lang.System': FqName@995) = null
+    packageFragments('java.lang.T': FqName@996) = null
+    packageFragments('java.lang.Tag': FqName@997) = null
+    packageFragments('java.lang.TagWithText': FqName@998) = null
+    packageFragments('java.lang.Title': FqName@999) = null
+    packageFragments('java.lang.UL': FqName@1000) = null
+    packageFragments('java.lang.Unit': FqName@1001) = null
+    packageFragments('java.lang.V': FqName@1002) = null
+    packageFragments('java.util': FqName@1003) = LazyJavaPackageFragment@1004['util']
+    packageFragments('java.util.A': FqName@1005) = null
+    packageFragments('java.util.Any': FqName@1006) = null
+    packageFragments('java.util.Array': FqName@1007) = null
+    packageFragments('java.util.B': FqName@1008) = null
+    packageFragments('java.util.Body': FqName@1009) = null
+    packageFragments('java.util.BodyTag': FqName@1010) = null
+    packageFragments('java.util.Element': FqName@1011) = null
+    packageFragments('java.util.H1': FqName@1012) = null
+    packageFragments('java.util.HTML': FqName@1013) = null
+    packageFragments('java.util.Head': FqName@1014) = null
+    packageFragments('java.util.K': FqName@1015) = null
+    packageFragments('java.util.LI': FqName@1016) = null
+    packageFragments('java.util.MutableMap': FqName@1017) = null
+    packageFragments('java.util.P': FqName@1018) = null
+    packageFragments('java.util.String': FqName@1019) = null
+    packageFragments('java.util.StringBuilder': FqName@1020) = null
+    packageFragments('java.util.System': FqName@1021) = null
+    packageFragments('java.util.T': FqName@1022) = null
+    packageFragments('java.util.Tag': FqName@1023) = null
+    packageFragments('java.util.TagWithText': FqName@1024) = null
+    packageFragments('java.util.Title': FqName@1025) = null
+    packageFragments('java.util.UL': FqName@1026) = null
+    packageFragments('java.util.Unit': FqName@1027) = null
+    packageFragments('java.util.V': FqName@1028) = null
+    packageFragments('kotlin': FqName@1029) = null
+    packageFragments('kotlin.A': FqName@1030) = null
+    packageFragments('kotlin.Any': FqName@1031) = null
+    packageFragments('kotlin.Array': FqName@1032) = null
+    packageFragments('kotlin.B': FqName@1033) = null
+    packageFragments('kotlin.Body': FqName@1034) = null
+    packageFragments('kotlin.BodyTag': FqName@1035) = null
+    packageFragments('kotlin.Element': FqName@1036) = null
+    packageFragments('kotlin.H1': FqName@1037) = null
+    packageFragments('kotlin.HTML': FqName@1038) = null
+    packageFragments('kotlin.Head': FqName@1039) = null
+    packageFragments('kotlin.K': FqName@1040) = null
+    packageFragments('kotlin.LI': FqName@1041) = null
+    packageFragments('kotlin.MutableMap': FqName@1042) = null
+    packageFragments('kotlin.P': FqName@1043) = null
+    packageFragments('kotlin.String': FqName@1044) = null
+    packageFragments('kotlin.StringBuilder': FqName@1045) = null
+    packageFragments('kotlin.System': FqName@1046) = null
+    packageFragments('kotlin.T': FqName@1047) = null
+    packageFragments('kotlin.Tag': FqName@1048) = null
+    packageFragments('kotlin.TagWithText': FqName@1049) = null
+    packageFragments('kotlin.Title': FqName@1050) = null
+    packageFragments('kotlin.UL': FqName@1051) = null
+    packageFragments('kotlin.Unit': FqName@1052) = null
+    packageFragments('kotlin.V': FqName@1053) = null
+    packageFragments('kotlin.io': FqName@1054) = null
+    packageFragments('kotlin.jvm': FqName@1055) = null
+    topLevelClasses(JavaClassImpl@268['AbstractCollection']) = LazyJavaClassDescriptor@12['AbstractCollection']
+    topLevelClasses(JavaClassImpl@272['AbstractList']) = LazyJavaClassDescriptor@24['AbstractList']
+    topLevelClasses(JavaClassImpl@277['AbstractMap']) = LazyJavaClassDescriptor@37['AbstractMap']
+    topLevelClasses(JavaClassImpl@280['AbstractStringBuilder']) = LazyJavaClassDescriptor@52['AbstractStringBuilder']
+    topLevelClasses(JavaClassImpl@351['Appendable']) = LazyJavaClassDescriptor@66['Appendable']
+    topLevelClasses(JavaClassImpl@1056['ArrayList']) = LazyJavaClassDescriptor@83['ArrayList']
+    topLevelClasses(JavaClassImpl@370['AutoCloseable']) = LazyJavaClassDescriptor@102['AutoCloseable']
+    topLevelClasses(JavaClassImpl@421['Closeable']) = LazyJavaClassDescriptor@106['Closeable']
+    topLevelClasses(JavaClassImpl@533['FilterOutputStream']) = LazyJavaClassDescriptor@110['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@1057['HashMap']) = LazyJavaClassDescriptor@114['HashMap']
+    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@780['StringBuffer']) = LazyJavaClassDescriptor@168['StringBuffer']
+    topLevelClasses(JavaClassImpl@1058['StringBuilder']) = LazyJavaClassDescriptor@170['StringBuilder']
+    topLevelClasses(JavaClassImpl@1059['System']) = LazyJavaClassDescriptor@190['System']
 }
 
-LazyJavaClassifierType@923['V'] {
-    arguments = ArrayList@924[empty]
-    classifier = JavaTypeParameterImpl@898['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
+LazyJavaPackageFragment@974['java'] {
+    classes('lang': Name@1060) = null // through LazyPackageFragmentScopeForJavaPackage@1061
+    classes('util': Name@1062) = null // through LazyPackageFragmentScopeForJavaPackage@1061
+    deserializedPackageScope = Empty@1063 // through LazyPackageFragmentScopeForJavaPackage@1061
+    functions('lang': Name@1064) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1061
+    functions('util': Name@1065) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1061
+    memberIndex = computeMemberIndex$1@1066 // through LazyPackageFragmentScopeForJavaPackage@1061
 }
 
-LazyJavaClassifierType@925['V'] {
-    arguments = ArrayList@926[empty]
-    classifier = JavaTypeParameterImpl@902['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
+LazyJavaPackageFragment@978['lang'] {
+    classes('A': Name@1067) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('ArrayList': Name@1069) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('B': Name@1070) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('Body': Name@1071) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('H1': Name@1072) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('HTML': Name@1073) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('HashMap': Name@1074) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('Head': Name@1075) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('LI': Name@1076) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('P': Name@1077) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('StringBuilder': Name@1078) = LazyJavaClassDescriptor@170['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('System': Name@1079) = LazyJavaClassDescriptor@190['System'] // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('TextElement': Name@1080) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('Title': Name@1081) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('UL': Name@1082) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('a': Name@1083) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('attributes': Name@1084) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('b': Name@1085) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('body': Name@1086) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('children': Name@1087) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('equals': Name@1088) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('h1': Name@1089) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('head': Name@1090) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('html': Name@1091) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('init': Name@1092) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('initTag': Name@1093) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('invoke': Name@1094) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('li': Name@1095) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('name': Name@1096) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('p': Name@1097) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('println': Name@1098) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('render': Name@1099) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('renderAttributes': Name@1100) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('text': Name@1101) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('title': Name@1102) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    classes('ul': Name@1103) = null // through LazyPackageFragmentScopeForJavaPackage@1068
+    deserializedPackageScope = Empty@1063 // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('A': Name@1067) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('ArrayList': Name@1069) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('B': Name@1070) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('Body': Name@1071) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('H1': Name@1072) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('HTML': Name@1073) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('HashMap': Name@1074) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('Head': Name@1075) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('LI': Name@1076) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('P': Name@1077) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('StringBuilder': Name@1104) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('TextElement': Name@1080) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('Title': Name@1081) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('UL': Name@1082) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('a': Name@1083) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('b': Name@1085) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('body': Name@1086) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('equals': Name@1088) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('h1': Name@1089) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('head': Name@1090) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('html': Name@1091) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('init': Name@1092) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('initTag': Name@1093) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('invoke': Name@1094) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('li': Name@1095) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('p': Name@1097) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('println': Name@1098) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('render': Name@1099) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('renderAttributes': Name@1100) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('title': Name@1102) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    functions('ul': Name@1103) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1068
+    memberIndex = computeMemberIndex$1@1105 // through LazyPackageFragmentScopeForJavaPackage@1068
 }
 
-LazyJavaClassifierType@927['V'] {
-    arguments = ArrayList@928[empty]
-    classifier = JavaTypeParameterImpl@914['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
+LazyJavaPackageFragment@1004['util'] {
+    classes('A': Name@1067) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('Any': Name@1107) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('Array': Name@1108) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('ArrayList': Name@1069) = LazyJavaClassDescriptor@83['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('B': Name@1070) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('Body': Name@1071) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('H1': Name@1072) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('HTML': Name@1073) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('HashMap': Name@1074) = LazyJavaClassDescriptor@114['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('Head': Name@1075) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('LI': Name@1076) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('MutableMap': Name@1109) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('P': Name@1077) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('String': Name@1110) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('StringBuilder': Name@1078) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('System': Name@1079) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('TextElement': Name@1080) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('Title': Name@1081) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('UL': Name@1082) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('Unit': Name@1111) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('a': Name@1083) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('attributes': Name@1084) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('b': Name@1085) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('body': Name@1086) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('children': Name@1087) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('equals': Name@1088) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('h1': Name@1089) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('head': Name@1090) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('html': Name@1091) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('init': Name@1092) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('initTag': Name@1093) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('invoke': Name@1094) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('li': Name@1095) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('name': Name@1096) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('p': Name@1097) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('println': Name@1098) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('render': Name@1099) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('renderAttributes': Name@1100) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('text': Name@1101) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('title': Name@1102) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    classes('ul': Name@1103) = null // through LazyPackageFragmentScopeForJavaPackage@1106
+    deserializedPackageScope = Empty@1063 // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('A': Name@1067) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('ArrayList': Name@1069) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('B': Name@1070) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('Body': Name@1071) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('H1': Name@1072) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('HTML': Name@1073) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('HashMap': Name@1074) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('Head': Name@1075) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('LI': Name@1076) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('P': Name@1077) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('StringBuilder': Name@1104) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('TextElement': Name@1080) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('Title': Name@1081) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('UL': Name@1082) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('a': Name@1083) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('b': Name@1085) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('body': Name@1086) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('equals': Name@1088) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('h1': Name@1089) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('head': Name@1090) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('html': Name@1091) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('init': Name@1092) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('initTag': Name@1093) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('invoke': Name@1094) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('li': Name@1095) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('p': Name@1097) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('println': Name@1098) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('render': Name@1099) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('renderAttributes': Name@1100) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('title': Name@1102) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    functions('ul': Name@1103) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@1106
+    memberIndex = computeMemberIndex$1@1112 // through LazyPackageFragmentScopeForJavaPackage@1106
 }
 
-LazyJavaClassifierType@929['V'] {
-    arguments = ArrayList@930[empty]
-    classifier = JavaTypeParameterImpl@917['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
-}
-
-LazyJavaClassifierType@931['V'] {
-    arguments = ArrayList@932[empty]
-    classifier = JavaTypeParameterImpl@920['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
-}
-
-LazyJavaClassifierType@933['V'] {
-    arguments = ArrayList@934[empty]
-    classifier = JavaTypeParameterImpl@895['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
-}
-
-LazyJavaClassifierType@935['V'] {
-    arguments = ArrayList@936[empty]
-    classifier = JavaTypeParameterImpl@905['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
-}
-
-LazyJavaClassifierType@937['V'] {
-    arguments = ArrayList@938[empty]
-    classifier = JavaTypeParameterImpl@888['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
-}
-
-LazyJavaClassifierType@939['V'] {
-    arguments = ArrayList@940[empty]
-    classifier = JavaTypeParameterImpl@892['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
-}
-
-LazyJavaClassifierType@941['V'] {
-    arguments = ArrayList@942[empty]
-    classifier = JavaTypeParameterImpl@911['V']
-    nullable = 'true': Boolean@327
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
-}
-
-LazyJavaPackageFragmentProvider@943 {
-    packageFragments('<root>': FqName@944) = LazyJavaPackageFragment@945['<root>']
-    packageFragments('A': FqName@946) = null
-    packageFragments('Any': FqName@947) = null
-    packageFragments('Array': FqName@948) = null
-    packageFragments('B': FqName@949) = null
-    packageFragments('Body': FqName@950) = null
-    packageFragments('BodyTag': FqName@951) = null
-    packageFragments('Element': FqName@952) = null
-    packageFragments('H1': FqName@953) = null
-    packageFragments('HTML': FqName@954) = null
-    packageFragments('Head': FqName@955) = null
-    packageFragments('K': FqName@956) = null
-    packageFragments('LI': FqName@957) = null
-    packageFragments('MutableMap': FqName@958) = null
-    packageFragments('P': FqName@959) = null
-    packageFragments('String': FqName@960) = null
-    packageFragments('StringBuilder': FqName@961) = null
-    packageFragments('System': FqName@962) = null
-    packageFragments('T': FqName@963) = null
-    packageFragments('Tag': FqName@964) = null
-    packageFragments('TagWithText': FqName@965) = null
-    packageFragments('Title': FqName@966) = null
-    packageFragments('UL': FqName@967) = null
-    packageFragments('Unit': FqName@968) = null
-    packageFragments('V': FqName@969) = null
-    packageFragments('html': FqName@970) = null
-    packageFragments('html.A': FqName@971) = null
-    packageFragments('html.Any': FqName@972) = null
-    packageFragments('html.Array': FqName@973) = null
-    packageFragments('html.B': FqName@974) = null
-    packageFragments('html.Body': FqName@975) = null
-    packageFragments('html.BodyTag': FqName@976) = null
-    packageFragments('html.Element': FqName@977) = null
-    packageFragments('html.H1': FqName@978) = null
-    packageFragments('html.HTML': FqName@979) = null
-    packageFragments('html.Head': FqName@980) = null
-    packageFragments('html.K': FqName@981) = null
-    packageFragments('html.LI': FqName@982) = null
-    packageFragments('html.MutableMap': FqName@983) = null
-    packageFragments('html.P': FqName@984) = null
-    packageFragments('html.String': FqName@985) = null
-    packageFragments('html.StringBuilder': FqName@986) = null
-    packageFragments('html.System': FqName@987) = null
-    packageFragments('html.T': FqName@988) = null
-    packageFragments('html.Tag': FqName@989) = null
-    packageFragments('html.TagWithText': FqName@990) = null
-    packageFragments('html.TextElement': FqName@991) = null
-    packageFragments('html.Title': FqName@992) = null
-    packageFragments('html.UL': FqName@993) = null
-    packageFragments('html.Unit': FqName@994) = null
-    packageFragments('html.V': FqName@995) = null
-    packageFragments('java': FqName@996) = LazyJavaPackageFragment@997['java']
-    packageFragments('java.io': FqName@998) = LazyJavaPackageFragment@999['io']
-    packageFragments('java.lang': FqName@1000) = LazyJavaPackageFragment@1001['lang']
-    packageFragments('java.lang.A': FqName@1002) = null
-    packageFragments('java.lang.Any': FqName@1003) = null
-    packageFragments('java.lang.Array': FqName@1004) = null
-    packageFragments('java.lang.B': FqName@1005) = null
-    packageFragments('java.lang.Body': FqName@1006) = null
-    packageFragments('java.lang.BodyTag': FqName@1007) = null
-    packageFragments('java.lang.Element': FqName@1008) = null
-    packageFragments('java.lang.H1': FqName@1009) = null
-    packageFragments('java.lang.HTML': FqName@1010) = null
-    packageFragments('java.lang.Head': FqName@1011) = null
-    packageFragments('java.lang.K': FqName@1012) = null
-    packageFragments('java.lang.LI': FqName@1013) = null
-    packageFragments('java.lang.MutableMap': FqName@1014) = null
-    packageFragments('java.lang.P': FqName@1015) = null
-    packageFragments('java.lang.String': FqName@1016) = null
-    packageFragments('java.lang.StringBuilder': FqName@1017) = null
-    packageFragments('java.lang.System': FqName@1018) = null
-    packageFragments('java.lang.T': FqName@1019) = null
-    packageFragments('java.lang.Tag': FqName@1020) = null
-    packageFragments('java.lang.TagWithText': FqName@1021) = null
-    packageFragments('java.lang.Title': FqName@1022) = null
-    packageFragments('java.lang.UL': FqName@1023) = null
-    packageFragments('java.lang.Unit': FqName@1024) = null
-    packageFragments('java.lang.V': FqName@1025) = null
-    packageFragments('java.util': FqName@1026) = LazyJavaPackageFragment@1027['util']
-    packageFragments('java.util.A': FqName@1028) = null
-    packageFragments('java.util.Any': FqName@1029) = null
-    packageFragments('java.util.Array': FqName@1030) = null
-    packageFragments('java.util.B': FqName@1031) = null
-    packageFragments('java.util.Body': FqName@1032) = null
-    packageFragments('java.util.BodyTag': FqName@1033) = null
-    packageFragments('java.util.Element': FqName@1034) = null
-    packageFragments('java.util.H1': FqName@1035) = null
-    packageFragments('java.util.HTML': FqName@1036) = null
-    packageFragments('java.util.Head': FqName@1037) = null
-    packageFragments('java.util.K': FqName@1038) = null
-    packageFragments('java.util.LI': FqName@1039) = null
-    packageFragments('java.util.MutableMap': FqName@1040) = null
-    packageFragments('java.util.P': FqName@1041) = null
-    packageFragments('java.util.String': FqName@1042) = null
-    packageFragments('java.util.StringBuilder': FqName@1043) = null
-    packageFragments('java.util.System': FqName@1044) = null
-    packageFragments('java.util.T': FqName@1045) = null
-    packageFragments('java.util.Tag': FqName@1046) = null
-    packageFragments('java.util.TagWithText': FqName@1047) = null
-    packageFragments('java.util.Title': FqName@1048) = null
-    packageFragments('java.util.UL': FqName@1049) = null
-    packageFragments('java.util.Unit': FqName@1050) = null
-    packageFragments('java.util.V': FqName@1051) = null
-    packageFragments('kotlin': FqName@1052) = null
-    packageFragments('kotlin.A': FqName@1053) = null
-    packageFragments('kotlin.Any': FqName@1054) = null
-    packageFragments('kotlin.Array': FqName@1055) = null
-    packageFragments('kotlin.B': FqName@1056) = null
-    packageFragments('kotlin.Body': FqName@1057) = null
-    packageFragments('kotlin.BodyTag': FqName@1058) = null
-    packageFragments('kotlin.Element': FqName@1059) = null
-    packageFragments('kotlin.H1': FqName@1060) = null
-    packageFragments('kotlin.HTML': FqName@1061) = null
-    packageFragments('kotlin.Head': FqName@1062) = null
-    packageFragments('kotlin.K': FqName@1063) = null
-    packageFragments('kotlin.LI': FqName@1064) = null
-    packageFragments('kotlin.MutableMap': FqName@1065) = null
-    packageFragments('kotlin.P': FqName@1066) = null
-    packageFragments('kotlin.String': FqName@1067) = null
-    packageFragments('kotlin.StringBuilder': FqName@1068) = null
-    packageFragments('kotlin.System': FqName@1069) = null
-    packageFragments('kotlin.T': FqName@1070) = null
-    packageFragments('kotlin.Tag': FqName@1071) = null
-    packageFragments('kotlin.TagWithText': FqName@1072) = null
-    packageFragments('kotlin.Title': FqName@1073) = null
-    packageFragments('kotlin.UL': FqName@1074) = null
-    packageFragments('kotlin.Unit': FqName@1075) = null
-    packageFragments('kotlin.V': FqName@1076) = null
-    packageFragments('kotlin.io': FqName@1077) = null
-    packageFragments('kotlin.jvm': FqName@1078) = null
-    topLevelClasses(JavaClassImpl@272['AbstractCollection']) = LazyJavaClassDescriptor@12['AbstractCollection']
-    topLevelClasses(JavaClassImpl@276['AbstractList']) = LazyJavaClassDescriptor@27['AbstractList']
-    topLevelClasses(JavaClassImpl@281['AbstractMap']) = LazyJavaClassDescriptor@40['AbstractMap']
-    topLevelClasses(JavaClassImpl@284['AbstractStringBuilder']) = LazyJavaClassDescriptor@60['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@357['Appendable']) = LazyJavaClassDescriptor@76['Appendable']
-    topLevelClasses(JavaClassImpl@1079['ArrayList']) = LazyJavaClassDescriptor@94['ArrayList']
-    topLevelClasses(JavaClassImpl@374['AutoCloseable']) = LazyJavaClassDescriptor@111['AutoCloseable']
-    topLevelClasses(JavaClassImpl@427['Closeable']) = LazyJavaClassDescriptor@115['Closeable']
-    topLevelClasses(JavaClassImpl@537['FilterOutputStream']) = LazyJavaClassDescriptor@119['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@1080['HashMap']) = LazyJavaClassDescriptor@123['HashMap']
-    topLevelClasses(JavaClassImpl@719['OutputStream']) = LazyJavaClassDescriptor@143['OutputStream']
-    topLevelClasses(JavaClassImpl@722['PrintStream']) = LazyJavaClassDescriptor@147['PrintStream']
-    topLevelClasses(JavaClassImpl@726['RandomAccess']) = LazyJavaClassDescriptor@163['RandomAccess']
-    topLevelClasses(JavaClassImpl@734['Serializable']) = LazyJavaClassDescriptor@167['Serializable']
-    topLevelClasses(JavaClassImpl@806['StringBuffer']) = LazyJavaClassDescriptor@174['StringBuffer']
-    topLevelClasses(JavaClassImpl@1081['StringBuilder']) = LazyJavaClassDescriptor@176['StringBuilder']
-    topLevelClasses(JavaClassImpl@1082['System']) = LazyJavaClassDescriptor@194['System']
-}
-
-LazyJavaPackageFragment@997['java'] {
-    classes('lang': Name@1083) = null // through LazyPackageFragmentScopeForJavaPackage@1084
-    classes('util': Name@1085) = null // through LazyPackageFragmentScopeForJavaPackage@1084
-    deserializedPackageScope = Empty@1086 // through LazyPackageFragmentScopeForJavaPackage@1084
-    functions('lang': Name@1087) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1084
-    functions('util': Name@1088) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1084
-    memberIndex = computeMemberIndex$1@1089 // through LazyPackageFragmentScopeForJavaPackage@1084
-}
-
-LazyJavaPackageFragment@1001['lang'] {
-    classes('A': Name@1090) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('ArrayList': Name@1092) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('B': Name@1093) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('Body': Name@1094) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('H1': Name@1095) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('HTML': Name@1096) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('HashMap': Name@1097) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('Head': Name@1098) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('LI': Name@1099) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('P': Name@1100) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('StringBuilder': Name@1101) = LazyJavaClassDescriptor@176['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('System': Name@1102) = LazyJavaClassDescriptor@194['System'] // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('TextElement': Name@1103) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('Title': Name@1104) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('UL': Name@1105) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('a': Name@1106) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('add': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('append': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('attributes': Name@1107) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('b': Name@1108) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('body': Name@1109) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('children': Name@1110) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('equals': Name@1111) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('get': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('h1': Name@1112) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('hasNext': Name@1113) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('head': Name@1114) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('html': Name@1115) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('init': Name@1116) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('initTag': Name@1117) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('invoke': Name@1118) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('iterator': Name@1119) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('keySet': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('li': Name@1120) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('name': Name@1121) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('next': Name@1122) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('p': Name@1123) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('plus': Name@1124) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('print': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('println': Name@1125) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('put': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('render': Name@1126) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('renderAttributes': Name@1127) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('text': Name@1128) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('title': Name@1129) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('toString': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    classes('ul': Name@1130) = null // through LazyPackageFragmentScopeForJavaPackage@1091
-    deserializedPackageScope = Empty@1086 // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('A': Name@1090) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('ArrayList': Name@1092) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('B': Name@1093) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('Body': Name@1094) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('H1': Name@1095) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('HTML': Name@1096) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('HashMap': Name@1097) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('Head': Name@1098) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('LI': Name@1099) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('P': Name@1100) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('StringBuilder': Name@1131) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('TextElement': Name@1103) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('Title': Name@1104) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('UL': Name@1105) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('a': Name@1106) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('add': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('append': Name@72) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('b': Name@1108) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('body': Name@1109) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('equals': Name@1111) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('get': Name@53) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('h1': Name@1112) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('hasNext': Name@1113) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('head': Name@1114) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('html': Name@1115) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('init': Name@1116) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('initTag': Name@1117) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('invoke': Name@1118) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('iterator': Name@1119) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('keySet': Name@54) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('li': Name@1120) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('next': Name@1122) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('p': Name@1123) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('plus': Name@1124) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('print': Name@90) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('println': Name@1125) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('put': Name@57) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('render': Name@1126) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('renderAttributes': Name@1127) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('title': Name@1129) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('toString': Name@73) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    functions('ul': Name@1130) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1091
-    memberIndex = computeMemberIndex$1@1132 // through LazyPackageFragmentScopeForJavaPackage@1091
-}
-
-LazyJavaPackageFragment@1027['util'] {
-    classes('A': Name@1090) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('Any': Name@1134) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('Array': Name@1135) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('ArrayList': Name@1092) = LazyJavaClassDescriptor@94['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('B': Name@1093) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('Body': Name@1094) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('H1': Name@1095) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('HTML': Name@1096) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('HashMap': Name@1097) = LazyJavaClassDescriptor@123['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('Head': Name@1098) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('LI': Name@1099) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('MutableMap': Name@1136) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('P': Name@1100) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('String': Name@1137) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('StringBuilder': Name@1101) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('System': Name@1102) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('TextElement': Name@1103) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('Title': Name@1104) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('UL': Name@1105) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('Unit': Name@1138) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('a': Name@1106) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('add': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('append': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('attributes': Name@1107) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('b': Name@1108) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('body': Name@1109) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('children': Name@1110) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('equals': Name@1111) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('get': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('h1': Name@1112) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('hasNext': Name@1113) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('head': Name@1114) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('html': Name@1115) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('init': Name@1116) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('initTag': Name@1117) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('invoke': Name@1118) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('iterator': Name@1119) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('keySet': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('li': Name@1120) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('name': Name@1121) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('next': Name@1122) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('p': Name@1123) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('plus': Name@1124) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('print': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('println': Name@1125) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('put': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('render': Name@1126) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('renderAttributes': Name@1127) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('text': Name@1128) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('title': Name@1129) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('toString': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    classes('ul': Name@1130) = null // through LazyPackageFragmentScopeForJavaPackage@1133
-    deserializedPackageScope = Empty@1086 // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('A': Name@1090) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('ArrayList': Name@1092) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('B': Name@1093) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('Body': Name@1094) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('H1': Name@1095) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('HTML': Name@1096) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('HashMap': Name@1097) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('Head': Name@1098) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('LI': Name@1099) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('P': Name@1100) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('StringBuilder': Name@1131) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('TextElement': Name@1103) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('Title': Name@1104) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('UL': Name@1105) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('a': Name@1106) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('add': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('append': Name@72) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('b': Name@1108) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('body': Name@1109) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('equals': Name@1111) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('get': Name@53) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('h1': Name@1112) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('hasNext': Name@1113) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('head': Name@1114) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('html': Name@1115) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('init': Name@1116) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('initTag': Name@1117) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('invoke': Name@1118) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('iterator': Name@1119) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('keySet': Name@54) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('li': Name@1120) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('next': Name@1122) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('p': Name@1123) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('plus': Name@1124) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('print': Name@90) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('println': Name@1125) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('put': Name@57) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('render': Name@1126) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('renderAttributes': Name@1127) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('title': Name@1129) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('toString': Name@73) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    functions('ul': Name@1130) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@1133
-    memberIndex = computeMemberIndex$1@1139 // through LazyPackageFragmentScopeForJavaPackage@1133
+LazyJavaTypeParameterDescriptor@202['E'] {
+    defaultType = JetTypeImpl@1113['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
+    upperBounds = LinkedHashSet@1114[1] { NullableType@1115 }
+    upperBoundsAsType = NullableType@1115
 }
 
 LazyJavaTypeParameterDescriptor@206['E'] {
-    defaultType = JetTypeImpl@1140['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
-    upperBounds = LinkedHashSet@1141[1] { NullableType@1142 }
-    upperBoundsAsType = NullableType@1142
+    defaultType = JetTypeImpl@1116['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@442
+    upperBounds = LinkedHashSet@1117[1] { NullableType@1118 }
+    upperBoundsAsType = NullableType@1118
 }
 
-LazyJavaTypeParameterDescriptor@227['E'] {
-    defaultType = JetTypeImpl@1143['E']
+LazyJavaTypeParameterDescriptor@223['E'] {
+    defaultType = JetTypeImpl@1119['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@450
-    upperBounds = LinkedHashSet@1144[1] { NullableType@1145 }
-    upperBoundsAsType = NullableType@1145
+    upperBounds = LinkedHashSet@1120[1] { NullableType@1121 }
+    upperBoundsAsType = NullableType@1121
 }
 
-LazyJavaTypeParameterDescriptor@210['E'] {
-    defaultType = JetTypeImpl@1146['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@446
-    upperBounds = LinkedHashSet@1147[1] { NullableType@1148 }
-    upperBoundsAsType = NullableType@1148
+LazyJavaTypeParameterDescriptor@237['K'] {
+    defaultType = JetTypeImpl@1122['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@568
+    upperBounds = LinkedHashSet@1123[1] { NullableType@1124 }
+    upperBoundsAsType = NullableType@1124
 }
 
-LazyJavaTypeParameterDescriptor@215['K'] {
-    defaultType = JetTypeImpl@1149['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@572
-    upperBounds = LinkedHashSet@1150[1] { NullableType@1151 }
-    upperBoundsAsType = NullableType@1151
+LazyJavaTypeParameterDescriptor@211['K'] {
+    defaultType = JetTypeImpl@1125['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@575
+    upperBounds = LinkedHashSet@1126[1] { NullableType@1127 }
+    upperBoundsAsType = NullableType@1127
 }
 
-LazyJavaTypeParameterDescriptor@241['K'] {
-    defaultType = JetTypeImpl@1152['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
-    upperBounds = LinkedHashSet@1153[1] { NullableType@1154 }
-    upperBoundsAsType = NullableType@1154
+LazyJavaTypeParameterDescriptor@238['V'] {
+    defaultType = JetTypeImpl@1128['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@870
+    upperBounds = LinkedHashSet@1129[1] { NullableType@1130 }
+    upperBoundsAsType = NullableType@1130
 }
 
-LazyJavaTypeParameterDescriptor@216['V'] {
-    defaultType = JetTypeImpl@1155['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@899
-    upperBounds = LinkedHashSet@1156[1] { NullableType@1157 }
-    upperBoundsAsType = NullableType@1157
+LazyJavaTypeParameterDescriptor@212['V'] {
+    defaultType = JetTypeImpl@1131['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@866
+    upperBounds = LinkedHashSet@1132[1] { NullableType@1133 }
+    upperBoundsAsType = NullableType@1133
 }
 
-LazyJavaTypeParameterDescriptor@242['V'] {
-    defaultType = JetTypeImpl@1158['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@889
-    upperBounds = LinkedHashSet@1159[1] { NullableType@1160 }
-    upperBoundsAsType = NullableType@1160
+LazyJavaTypeParameterResolver@1134 {
+    resolve(JavaTypeParameterImpl@1135['E']) = LazyJavaTypeParameterDescriptor@206['E']
 }
 
-LazyJavaTypeParameterResolver@1161 {
-    resolve(JavaTypeParameterImpl@1162['E']) = LazyJavaTypeParameterDescriptor@210['E']
+LazyJavaTypeParameterResolver@1136 {
+    resolve(JavaTypeParameterImpl@1137['E']) = LazyJavaTypeParameterDescriptor@223['E']
 }
 
-LazyJavaTypeParameterResolver@1163 {
-    resolve(JavaTypeParameterImpl@1164['E']) = LazyJavaTypeParameterDescriptor@227['E']
+LazyJavaTypeParameterResolver@1138 {
+    resolve(JavaTypeParameterImpl@1139['E']) = LazyJavaTypeParameterDescriptor@202['E']
 }
 
-LazyJavaTypeParameterResolver@1165 {
-    resolve(JavaTypeParameterImpl@1166['E']) = LazyJavaTypeParameterDescriptor@206['E']
+LazyJavaTypeParameterResolver@1140 {
+    resolve(JavaTypeParameterImpl@480['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1167 {
+LazyJavaTypeParameterResolver@1141 {
+    resolve(JavaTypeParameterImpl@486['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1142 {
     resolve(JavaTypeParameterImpl@471['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1168 {
-    resolve(JavaTypeParameterImpl@465['E']) = null
+LazyJavaTypeParameterResolver@1143 {
+    resolve(JavaTypeParameterImpl@441['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1169 {
-    resolve(JavaTypeParameterImpl@478['E']) = null
+LazyJavaTypeParameterResolver@1144 {
+    resolve(JavaTypeParameterImpl@453['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1170 {
-    resolve(JavaTypeParameterImpl@449['E']) = null
+LazyJavaTypeParameterResolver@1145 {
+    resolve(JavaTypeParameterImpl@489['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1171 {
-    resolve(JavaTypeParameterImpl@481['E']) = null
+LazyJavaTypeParameterResolver@1146 {
+    resolve(JavaTypeParameterImpl@459['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1172 {
-    resolve(JavaTypeParameterImpl@474['E']) = null
+LazyJavaTypeParameterResolver@1147 {
+    resolve(JavaTypeParameterImpl@492['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1173 {
-    resolve(JavaTypeParameterImpl@445['E']) = null
+LazyJavaTypeParameterResolver@1148 {
+    resolve(JavaTypeParameterImpl@1149['K']) = LazyJavaTypeParameterDescriptor@211['K']
+    resolve(JavaTypeParameterImpl@1150['V']) = LazyJavaTypeParameterDescriptor@212['V']
 }
 
-LazyJavaTypeParameterResolver@1174 {
-    resolve(JavaTypeParameterImpl@496['E']) = null
+LazyJavaTypeParameterResolver@1151 {
+    resolve(JavaTypeParameterImpl@1152['K']) = LazyJavaTypeParameterDescriptor@237['K']
+    resolve(JavaTypeParameterImpl@1153['V']) = LazyJavaTypeParameterDescriptor@238['V']
 }
 
-LazyJavaTypeParameterResolver@1175 {
-    resolve(JavaTypeParameterImpl@1176['K']) = LazyJavaTypeParameterDescriptor@241['K']
-    resolve(JavaTypeParameterImpl@1177['V']) = LazyJavaTypeParameterDescriptor@242['V']
+LazyJavaTypeParameterResolver@1154 {
+    resolve(JavaTypeParameterImpl@596['K']) = null
+    resolve(JavaTypeParameterImpl@876['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1178 {
-    resolve(JavaTypeParameterImpl@1179['K']) = LazyJavaTypeParameterDescriptor@215['K']
-    resolve(JavaTypeParameterImpl@1180['V']) = LazyJavaTypeParameterDescriptor@216['V']
+LazyJavaTypeParameterResolver@1155 {
+    resolve(JavaTypeParameterImpl@578['K']) = null
+    resolve(JavaTypeParameterImpl@894['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1181 {
-    resolve(JavaTypeParameterImpl@582['K']) = null
-    resolve(JavaTypeParameterImpl@905['V']) = null
+LazyJavaTypeParameterResolver@1156 {
+    resolve(JavaTypeParameterImpl@567['K']) = null
 }
 
-LazyJavaTypeParameterResolver@1182 {
-    resolve(JavaTypeParameterImpl@594['K']) = null
-    resolve(JavaTypeParameterImpl@914['V']) = null
+LazyJavaTypeParameterResolver@1157 {
+    resolve(JavaTypeParameterImpl@581['K']) = null
 }
 
-LazyJavaTypeParameterResolver@1183 {
-    resolve(JavaTypeParameterImpl@609['K']) = null
+LazyJavaTypeParameterResolver@1158 {
+    resolve(JavaTypeParameterImpl@865['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1184 {
-    resolve(JavaTypeParameterImpl@588['K']) = null
+LazyJavaTypeParameterResolver@1159 {
+    resolve(JavaTypeParameterImpl@885['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1185 {
-    resolve(JavaTypeParameterImpl@911['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, ... }
 }
 
-LazyJavaTypeParameterResolver@1186 {
-    resolve(JavaTypeParameterImpl@895['V']) = null
+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@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@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@1194 {
+    <name not found> = ArrayList@1195[1] { ResolutionCandidate@1196 }
+    <name not found> = ArrayList@1197[1] { ResolutionCandidate@1196 }
+    <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> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1204 {
+    <name not found> = ArrayList@1205[1] { ResolutionCandidate@1206 }
+    <name not found> = ArrayList@1207[1] { ResolutionCandidate@1206 }
+    <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> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1211 {
+    <name not found> = ArrayList@1212[1] { ResolutionCandidate@1213 }
+    <name not found> = ArrayList@1214[1] { ResolutionCandidate@1213 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@75[empty]
+    <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> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1239 {
+    <name not found> = ArrayList@1240[1] { ResolutionCandidate@1241 }
+    <name not found> = ArrayList@1242[1] { ResolutionCandidate@1241 }
+    <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> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@1246 {
+    <name not found> = ArrayList@1247[1] { ResolutionCandidate@1248 }
+    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1248 }
+    <name not found> = ArrayList@1250[1] { ResolutionCandidate@1251 }
+    <name not found> = ArrayList@1252[1] { ResolutionCandidate@1251 }
+    <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 }
+    <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 }
+    <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 }
+    <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> = 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]
+}
+
+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 }
+    <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 }
+    <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> = 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]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@75[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@75[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@75[empty]
+}
+
+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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@1510 {
+    <name not found> = ArrayList@1511[1] { ResolutionCandidate@1512 }
+    <name not found> = ArrayList@1513[1] { ResolutionCandidate@1512 }
+}
+
+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@1522 {
+    <name not found> = ArrayList@1523[1] { ResolutionCandidate@1524 }
+    <name not found> = ArrayList@1525[1] { ResolutionCandidate@1524 }
+}
+
+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@1534 {
+    <name not found> = ArrayList@1535[1] { ResolutionCandidate@1536 }
+    <name not found> = ArrayList@1537[1] { ResolutionCandidate@1536 }
+}
+
+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@1546 {
+    <name not found> = ArrayList@1547[1] { ResolutionCandidate@1548 }
+    <name not found> = ArrayList@1549[1] { ResolutionCandidate@1548 }
+}
+
+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@1558 {
+    <name not found> = ArrayList@1559[1] { ResolutionCandidate@1560 }
+    <name not found> = ArrayList@1561[1] { ResolutionCandidate@1560 }
+}
+
+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@1570 {
+    <name not found> = ArrayList@1571[1] { ResolutionCandidate@1572 }
+    <name not found> = ArrayList@1573[1] { ResolutionCandidate@1572 }
+}
+
+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@1582 {
+    <name not found> = ArrayList@1583[1] { ResolutionCandidate@1584 }
+    <name not found> = ArrayList@1585[1] { ResolutionCandidate@1584 }
+}
+
+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@1594 {
+    <name not found> = ArrayList@1595[1] { ResolutionCandidate@1596 }
+    <name not found> = ArrayList@1597[1] { ResolutionCandidate@1596 }
+}
+
+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@1606 {
+    <name not found> = ArrayList@1607[1] { ResolutionCandidate@1608 }
+    <name not found> = ArrayList@1609[1] { ResolutionCandidate@1608 }
+}
+
+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@1618 {
+    <name not found> = ArrayList@1619[1] { ResolutionCandidate@1620 }
+    <name not found> = ArrayList@1621[1] { ResolutionCandidate@1620 }
+}
+
+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@1630 {
+    <name not found> = ArrayList@1631[1] { ResolutionCandidate@1632 }
+    <name not found> = ArrayList@1633[1] { ResolutionCandidate@1632 }
+}
+
+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@1642 {
+    <name not found> = ArrayList@1643[1] { ResolutionCandidate@1644 }
+    <name not found> = ArrayList@1645[1] { ResolutionCandidate@1644 }
+}
+
+ResolutionTaskHolder@1646 {
+    <name not found> = ArrayList@1647[1] { ResolutionCandidate@1648 }
+    <name not found> = ArrayList@1649[1] { ResolutionCandidate@1648 }
+}
+
+ResolutionTaskHolder@1650 {
+    <name not found> = ArrayList@1651[1] { ResolutionCandidate@1652 }
+    <name not found> = ArrayList@1653[1] { ResolutionCandidate@1652 }
+}
+
+ResolutionTaskHolder@1654 {
+    <name not found> = ArrayList@1655[1] { ResolutionCandidate@1656 }
+    <name not found> = ArrayList@1657[1] { ResolutionCandidate@1656 }
+}
+
+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> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@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]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@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, ... }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@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 64e89e73797..cd2d4f677a9 100644
--- a/compiler/testData/diagnostics/tests/Casts.lazy.log
+++ b/compiler/testData/diagnostics/tests/Casts.lazy.log
@@ -29,3 +29,60 @@ LazyJavaPackageFragment@6['java'] {
 LazyJavaPackageFragment@8['lang'] {
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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@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@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@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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log b/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
index 8654ed574c6..71a1edac199 100644
--- a/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/CharacterLiterals.lazy.log
@@ -31,3 +31,150 @@ LazyJavaPackageFragment@7['lang'] {
     functions('test': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <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]
+    <name not found> = EmptyList@17[empty]
+    <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> = 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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@62 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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/CompareToWithErrorType.lazy.log b/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
index 176702f63b6..19e570f67c1 100644
--- a/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/CompareToWithErrorType.lazy.log
@@ -11,26 +11,63 @@ LazyJavaPackageFragmentProvider@0 {
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('compareTo': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('x': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('compareTo': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('x': Name@18) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('x': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('x': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@6['lang'] {
-    classes('compareTo': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('x': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('compareTo': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('x': Name@18) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('x': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('x': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@30 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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 50a72695f2a..5bcbdb79555 100644
--- a/compiler/testData/diagnostics/tests/Constants.lazy.log
+++ b/compiler/testData/diagnostics/tests/Constants.lazy.log
@@ -44,54 +44,290 @@ LazyJavaPackageFragment@9['<root>'] {
     classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('Long': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('Short': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('minus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('testFun': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('toFloat': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargDouble': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargFloat': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargInt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargLong': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('varargShort': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('minus': Name@45) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('testFun': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('toFloat': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargByte': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargDouble': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargFloat': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargInt': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargLong': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('varargShort': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('testFun': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('varargByte': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('varargDouble': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('varargFloat': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('varargInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('varargLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('varargShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('testFun': Name@45) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('varargByte': Name@46) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('varargDouble': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('varargFloat': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('varargInt': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('varargLong': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('varargShort': Name@51) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('lang': Name@57) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
 LazyJavaPackageFragment@20['lang'] {
-    classes('minus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('testFun': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toFloat': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargDouble': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargFloat': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargInt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargLong': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('varargShort': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('minus': Name@45) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('testFun': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('toFloat': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('varargByte': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('varargDouble': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('varargFloat': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('varargInt': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('varargLong': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('varargShort': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('testFun': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('varargByte': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('varargDouble': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('varargFloat': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('varargInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('varargLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('varargShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('testFun': Name@45) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('varargByte': Name@46) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('varargDouble': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('varargFloat': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('varargInt': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('varargLong': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('varargShort': Name@51) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
+}
+
+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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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> = ArrayList@72[1] { ResolutionCandidate@71 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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> = 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]
+    <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@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]
+    <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@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@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[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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/Constructors.lazy.log b/compiler/testData/diagnostics/tests/Constructors.lazy.log
index 3db1af92b3d..f33e25c6b8a 100644
--- a/compiler/testData/diagnostics/tests/Constructors.lazy.log
+++ b/compiler/testData/diagnostics/tests/Constructors.lazy.log
@@ -56,3 +56,25 @@ LazyJavaPackageFragment@25['lang'] {
     classes('a': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@46
     deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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@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/ConstructorsOfPrimitives.lazy.log b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
index d8edd1d22c3..963af4ef679 100644
--- a/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
+++ b/compiler/testData/diagnostics/tests/ConstructorsOfPrimitives.lazy.log
@@ -85,3 +85,187 @@ LazyJavaPackageFragment@12['lang'] {
     functions('Short': Name@30) = 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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@51[1] { ResolutionCandidate@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]
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <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]
+    <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]
+    <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 f0ff2fa47e5..6a8614e7092 100644
--- a/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
+++ b/compiler/testData/diagnostics/tests/CovariantOverrideType.lazy.log
@@ -44,22 +44,21 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('Iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('List': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('Unit': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toDouble': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toDouble': Name@45) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('lang': Name@51) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('lang': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
-LazyJavaPackageFragment@19['lang'] {
-    classes('toDouble': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('toDouble': Name@45) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
index ce7d13fcbcd..46171885fcc 100644
--- a/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
+++ b/compiler/testData/diagnostics/tests/DefaultValuesTypechecking.lazy.log
@@ -30,24 +30,80 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('Boolean': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('z': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('plus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('z': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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@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@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 }
+}
+
+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> = 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[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+    <name not found> = ArrayList@88[8] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log b/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
index 8136862b4ae..f959b9d17b7 100644
--- a/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/DeferredTypes.lazy.log
@@ -17,25 +17,122 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('Foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('Foo': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('Foo': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('Foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Foo': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('Foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('Foo': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 2280e0c59c6..6094ecb6c94 100644
--- a/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/DiamondFunction.lazy.log
@@ -27,3 +27,13 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log b/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
index c1f70bd2d0e..0f4d8a27177 100644
--- a/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/DiamondFunctionGeneric.lazy.log
@@ -30,3 +30,13 @@ LazyJavaPackageFragment@11['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 }
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log b/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
index b6703e4209b..2357c85b5ea 100644
--- a/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/DiamondProperty.lazy.log
@@ -30,3 +30,13 @@ 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 }
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/Dollar.lazy.log b/compiler/testData/diagnostics/tests/Dollar.lazy.log
index 21f8bd53c3e..479090f234d 100644
--- a/compiler/testData/diagnostics/tests/Dollar.lazy.log
+++ b/compiler/testData/diagnostics/tests/Dollar.lazy.log
@@ -28,3 +28,27 @@ LazyJavaPackageFragment@12['lang'] {
     classes('$$$': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
     deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+    <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@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
diff --git a/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log b/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
index e9888e83f0c..7b64477b0a2 100644
--- a/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
+++ b/compiler/testData/diagnostics/tests/ForRangeConventions.lazy.log
@@ -90,19 +90,19 @@ LazyJavaClassifierType@58['E'] {
     arguments = ArrayList@59[empty]
     classifier = JavaTypeParameterImpl@60['E']
     nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@61['E'] {
     arguments = ArrayList@62[empty]
     classifier = JavaTypeParameterImpl@63['E']
     nullable = 'false': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@64['E'] {
     arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@56['E']
+    classifier = JavaTypeParameterImpl@63['E']
     nullable = 'true': Boolean@47
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
@@ -116,16 +116,16 @@ LazyJavaClassifierType@66['E'] {
 
 LazyJavaClassifierType@68['E'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@60['E']
+    classifier = JavaTypeParameterImpl@56['E']
     nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@70['E'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+    classifier = JavaTypeParameterImpl@60['E']
     nullable = 'true': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -331,18 +331,413 @@ LazyJavaPackageFragment@138['util'] {
 
 LazyJavaTypeParameterDescriptor@24['E'] {
     defaultType = JetTypeImpl@218['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
     upperBounds = LinkedHashSet@219[1] { NullableType@220 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@56['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@24['E']
 }
 
-LazyJavaTypeParameterResolver@222 {
-    resolve(JavaTypeParameterImpl@223['E']) = LazyJavaTypeParameterDescriptor@24['E']
+LazyJavaTypeParameterResolver@223 {
+    resolve(JavaTypeParameterImpl@52['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]
+    <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@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[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[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 }
+}
+
+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> = EmptyList@205[empty]
+    <name not found> = EmptyList@205[empty]
+}
+
+ResolutionTaskHolder@374 {
+    <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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@378 {
+    <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]
+    <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@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 2b25d8e2aa3..3b127853588 100644
--- a/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/FunctionCalleeExpressions.lazy.log
@@ -63,3 +63,739 @@ LazyJavaPackageFragment@21['lang'] {
     functions('invoke': Name@53) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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@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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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> = 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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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]
+    <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@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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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@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@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@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> = 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 }
+}
+
+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[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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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@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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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@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]
+    <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]
+    <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 {
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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@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 244bc704882..92e50529dcc 100644
--- a/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/FunctionReturnTypes.lazy.log
@@ -49,21 +49,21 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@29['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@33['String'] {
     arguments = ArrayList@34[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@26['String']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@23
 }
 
 LazyJavaClassifierType@35['String'] {
     arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@26['String']
+    classifier = JavaClassImpl@29['String']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@23
 }
@@ -91,21 +91,21 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@46['Throwable']
+    classifier = JavaClassImpl@39['Throwable']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@49['Throwable'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@39['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@40
 }
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@46['Throwable']
     nullable = 'true': Boolean@32
     typeConstructor = DeserializedClassTypeConstructor@40
 }
@@ -164,42 +164,350 @@ LazyJavaPackageFragment@57['<root>'] {
     classes('String': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@95
     classes('StringBuilder': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@95
     classes('Unit': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('compareTo': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('plus': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('plusAssign': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('returnNothing': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toChar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('Exception': Name@98) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('compareTo': Name@104) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('plus': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('plusAssign': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('returnNothing': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('toChar': Name@108) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('plusAssign': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('returnNothing': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('Exception': Name@98) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('plusAssign': Name@104) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('returnNothing': Name@105) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('lang': Name@114) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('lang': Name@111) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
 LazyJavaPackageFragment@72['lang'] {
-    classes('Exception': Name@98) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('StringBuilder': Name@102) = LazyJavaClassDescriptor@13['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('compareTo': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('plus': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('plusAssign': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('returnNothing': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('toChar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('Exception': Name@98) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('compareTo': Name@104) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('plus': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('plusAssign': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('returnNothing': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('toChar': Name@108) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('Exception': Name@98) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('StringBuilder': Name@102) = LazyJavaClassDescriptor@13['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('plusAssign': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('returnNothing': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@106 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('Exception': Name@98) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('plusAssign': Name@104) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('returnNothing': Name@105) = EmptyList@107[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
+}
+
+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]
+    <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 }
+    <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@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@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 {
+    <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> = 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> = 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[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[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@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@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@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@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@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@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@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@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@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@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@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@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@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@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]
+    <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]
+    <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 17064d5a2bf..d9df4d56e3b 100644
--- a/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
+++ b/compiler/testData/diagnostics/tests/GenericFunctionIsLessSpecific.lazy.log
@@ -38,3 +38,21 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+    <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/IllegalModifiers.lazy.log b/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
index bfa308cd80c..df54b5f0634 100644
--- a/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
+++ b/compiler/testData/diagnostics/tests/IllegalModifiers.lazy.log
@@ -118,3 +118,50 @@ LazyJavaPackageFragment@66['lang'] {
     classes('i': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@88
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@88
 }
+
+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@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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/IncDec.lazy.log b/compiler/testData/diagnostics/tests/IncDec.lazy.log
index fff44ee2368..d1fd613cd19 100644
--- a/compiler/testData/diagnostics/tests/IncDec.lazy.log
+++ b/compiler/testData/diagnostics/tests/IncDec.lazy.log
@@ -24,35 +24,294 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Unit': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('UnitIncDec': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('WrongIncDec': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('dec': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('inc': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('IncDec': Name@21) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('UnitIncDec': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('WrongIncDec': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('dec': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('inc': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('IncDec': Name@21) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('UnitIncDec': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('WrongIncDec': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@29 // 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@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('IncDec': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('UnitIncDec': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('WrongIncDec': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('dec': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inc': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('IncDec': Name@21) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('UnitIncDec': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('WrongIncDec': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('dec': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inc': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('IncDec': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('UnitIncDec': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('WrongIncDec': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('IncDec': Name@21) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('UnitIncDec': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('WrongIncDec': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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 }
+}
+
+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[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 }
+}
+
+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> = 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 }
+}
+
+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 }
+}
+
+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[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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log b/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
index b20d826a157..d402f1228d5 100644
--- a/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
+++ b/compiler/testData/diagnostics/tests/InferNullabilityInThenBlock.lazy.log
@@ -40,3 +40,31 @@ LazyJavaPackageFragment@10['lang'] {
     functions('ff': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+}
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log b/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
index c3973f8fdd5..cf8f5725e43 100644
--- a/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/LValueAssignment.lazy.log
@@ -60,25 +60,1659 @@ LazyJavaPackageFragment@16['lang'] {
     classes('A': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('D': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('foo': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('get': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('getArray': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('getInt': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('inc': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('plus': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('plusAssign': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('set': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('z': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('getInt': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('inc': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('plusAssign': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('set': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('z': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@56
     deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@56
     functions('A': Name@55) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     functions('D': Name@57) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     functions('foo': Name@58) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('get': Name@59) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('getArray': Name@60) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('getInt': Name@61) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('inc': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('plus': Name@63) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('plusAssign': Name@64) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('set': Name@65) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('z': Name@67) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('getInt': Name@59) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('inc': Name@60) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('plusAssign': Name@61) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('set': Name@62) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('z': Name@64) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@56
+}
+
+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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <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 }
+    <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@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@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@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@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 }
+}
+
+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 }
+}
+
+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[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 }
+}
+
+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> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+}
+
+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@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@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@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[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@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[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@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@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+}
+
+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@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+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[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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@533 {
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <name not found> = EmptyList@53[empty]
+    <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@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 f160cbcbe0d..1ef3fee925e 100644
--- a/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/MergePackagesWithJava.lazy.log
@@ -106,34 +106,72 @@ LazyJavaPackageFragment@48['java'] {
     classes('NullPointerException': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('equals': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('size': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('NullPointerException': Name@71) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('equals': Name@72) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@77) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('size': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('NullPointerException': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('equals': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('lang': Name@76) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
 LazyJavaPackageFragment@54['lang'] {
-    classes('Class': Name@79) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('NullPointerException': Name@71) = LazyJavaClassDescriptor@6['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('equals': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('size': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('NullPointerException': Name@71) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('equals': Name@72) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('size': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Class': Name@78) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('NullPointerException': Name@71) = LazyJavaClassDescriptor@6['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('equals': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('NullPointerException': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('equals': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
 LazyJavaTypeParameterDescriptor@16['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    upperBounds = LinkedHashSet@84[1] { NullableType@85 }
-    upperBoundsAsType = NullableType@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
+    upperBounds = LinkedHashSet@83[1] { NullableType@84 }
+    upperBoundsAsType = NullableType@84
 }
 
-LazyJavaTypeParameterResolver@86 {
-    resolve(JavaTypeParameterImpl@87['T']) = LazyJavaTypeParameterDescriptor@16['T']
+LazyJavaTypeParameterResolver@85 {
+    resolve(JavaTypeParameterImpl@86['T']) = LazyJavaTypeParameterDescriptor@16['T']
+}
+
+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> = 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@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]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@103 {
+    <name not found> = ArrayList@104[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[2] { ResolutionCandidate@105, ResolutionCandidate@106 }
 }
diff --git a/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log b/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
index b26f8b5e059..2f381c78075 100644
--- a/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
+++ b/compiler/testData/diagnostics/tests/MultilineStringTemplates.lazy.log
@@ -32,28 +32,246 @@ LazyJavaPackageFragment@11['<root>'] {
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('b': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('a': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('b': Name@36) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('a': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('b': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('b': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('a': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('b': Name@36) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('equals': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('b': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('a': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('b': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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> = 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 }
+}
+
+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> = 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> = 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 }
+}
+
+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 {
+    <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 }
+}
+
+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 }
+}
+
+ResolutionTaskHolder@163 {
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@165 {
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@166 {
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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 7b3d2a9fc82..034b293b87a 100644
--- a/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/MultipleBounds.lazy.log
@@ -72,16 +72,379 @@ LazyJavaPackageFragment@39['lang'] {
     classes('A': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('Test1': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('bar': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('foo': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('nioho': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('test2': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('nioho': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('test2': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
     deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@69
     functions('A': Name@68) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
     functions('C': Name@70) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
     functions('Test1': Name@71) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('bar': Name@72) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@73) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('test2': Name@75) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('test2': Name@73) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@69
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <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@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <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@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <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@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <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@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <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@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <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@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+    <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@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+    <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@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+    <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@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 }
+}
+
+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> = 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]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+}
+
+ResolutionTaskHolder@152 {
+    <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]
+    <name not found> = EmptyList@66[empty]
+    <name not found> = EmptyList@66[empty]
+}
+
+ResolutionTaskHolder@153 {
+    <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@154 {
+    <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@155 {
+    <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@156 {
+    <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@157 {
+    <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@158 {
+    <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@159 {
+    <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@160 {
+    <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@161 {
+    <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@162 {
+    <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]
 }
diff --git a/compiler/testData/diagnostics/tests/Nullability.lazy.log b/compiler/testData/diagnostics/tests/Nullability.lazy.log
index b276e735f7b..7f9f8192637 100644
--- a/compiler/testData/diagnostics/tests/Nullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/Nullability.lazy.log
@@ -49,258 +49,2674 @@ LazyJavaClassDescriptor@35['InputStream'] {
     defaultType = JetTypeImpl@36['InputStream']
     enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@38
     functions('equals': Name@4) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['equals'] } // through LazyJavaClassMemberScope@38
-    functions('read': Name@19) = ArrayList@41[3] { JavaMethodDescriptor@42['read'], JavaMethodDescriptor@43['read'], JavaMethodDescriptor@44['read'] } // through LazyJavaClassMemberScope@38
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@38
-    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@38
+    functions('read': Name@41) = ArrayList@42[3] { JavaMethodDescriptor@43['read'], JavaMethodDescriptor@44['read'], JavaMethodDescriptor@45['read'] } // through LazyJavaClassMemberScope@38
+    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@38
+    nestedClassIndex = LinkedHashMap@47 // through LazyJavaClassMemberScope@38
     nestedClasses('equals': Name@4) = null // through LazyJavaClassMemberScope@38
-    nestedClasses('read': Name@19) = null // through LazyJavaClassMemberScope@38
+    nestedClasses('read': Name@41) = null // through LazyJavaClassMemberScope@38
     properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
     properties('read': Name@19) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@47['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@48['InputStream']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@48['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@49['InputStream']
 }
 
-LazyJavaClassDescriptor@49['OutputStream'] {
-    functions('equals': Name@4) = ArrayList@50[1] { DeserializedSimpleFunctionDescriptor@51['equals'] } // through LazyJavaClassMemberScope@52
-    functions('println': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@52
-    memberIndex = computeMemberIndex$1@53 // through LazyJavaClassMemberScope@52
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@52
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@52
-    typeConstructor = LazyJavaClassTypeConstructor@54['OutputStream']
+LazyJavaClassDescriptor@50['OutputStream'] {
+    functions('equals': Name@4) = ArrayList@51[1] { DeserializedSimpleFunctionDescriptor@52['equals'] } // through LazyJavaClassMemberScope@53
+    functions('println': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@53
+    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
+    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@53
+    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@53
+    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
 }
 
-LazyJavaClassDescriptor@55['PrintStream'] {
-    defaultType = JetTypeImpl@56['PrintStream']
-    enumEntryIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@58
-    functions('equals': Name@4) = ArrayList@59[1] { DeserializedSimpleFunctionDescriptor@60['equals'] } // through LazyJavaClassMemberScope@58
-    functions('println': Name@11) = ArrayList@61[10] { JavaMethodDescriptor@62['println'], JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], ... } // through LazyJavaClassMemberScope@58
-    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@58
-    nestedClassIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@58
-    nestedClasses('equals': Name@4) = null // through LazyJavaClassMemberScope@58
-    nestedClasses('println': Name@11) = null // through LazyJavaClassMemberScope@58
-    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@58
-    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@58
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@67['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@68['PrintStream']
+LazyJavaClassDescriptor@56['PrintStream'] {
+    defaultType = JetTypeImpl@57['PrintStream']
+    enumEntryIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@59
+    functions('equals': Name@4) = ArrayList@60[1] { DeserializedSimpleFunctionDescriptor@61['equals'] } // through LazyJavaClassMemberScope@59
+    functions('println': Name@62) = ArrayList@63[10] { JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], JavaMethodDescriptor@66['println'], ... } // through LazyJavaClassMemberScope@59
+    memberIndex = computeMemberIndex$1@67 // through LazyJavaClassMemberScope@59
+    nestedClassIndex = LinkedHashMap@68 // through LazyJavaClassMemberScope@59
+    nestedClasses('equals': Name@4) = null // through LazyJavaClassMemberScope@59
+    nestedClasses('println': Name@62) = null // through LazyJavaClassMemberScope@59
+    properties('equals': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@59
+    properties('println': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@59
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@69['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@70['PrintStream']
 }
 
 LazyJavaClassTypeConstructor@12['Appendable'] {
-    parameters = ArrayList@69[empty]
-    supertypes = ArrayList@70[1] { JetTypeImpl@71['Any'] }
+    parameters = ArrayList@71[empty]
+    supertypes = ArrayList@72[1] { JetTypeImpl@73['Any'] }
 }
 
 LazyJavaClassTypeConstructor@20['AutoCloseable'] {
-    parameters = ArrayList@72[empty]
-    supertypes = ArrayList@73[1] { JetTypeImpl@71['Any'] }
+    parameters = ArrayList@74[empty]
+    supertypes = ArrayList@75[1] { JetTypeImpl@73['Any'] }
 }
 
 LazyJavaClassTypeConstructor@27['Closeable'] {
-    parameters = ArrayList@74[empty]
-    supertypes = ArrayList@75[1] { LazyJavaClassifierType@76['AutoCloseable'] }
+    parameters = ArrayList@76[empty]
+    supertypes = ArrayList@77[1] { LazyJavaClassifierType@78['AutoCloseable'] }
 }
 
 LazyJavaClassTypeConstructor@34['FilterOutputStream'] {
-    parameters = ArrayList@77[empty]
-    supertypes = ArrayList@78[1] { LazyJavaClassifierType@79['OutputStream'] }
+    parameters = ArrayList@79[empty]
+    supertypes = ArrayList@80[1] { LazyJavaClassifierType@81['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@48['InputStream'] {
-    parameters = ArrayList@80[empty]
-    supertypes = ArrayList@81[1] { LazyJavaClassifierType@82['Closeable'] }
+LazyJavaClassTypeConstructor@49['InputStream'] {
+    parameters = ArrayList@82[empty]
+    supertypes = ArrayList@83[1] { LazyJavaClassifierType@84['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@54['OutputStream'] {
-    parameters = ArrayList@83[empty]
-    supertypes = ArrayList@84[1] { LazyJavaClassifierType@85['Closeable'] }
+LazyJavaClassTypeConstructor@55['OutputStream'] {
+    parameters = ArrayList@85[empty]
+    supertypes = ArrayList@86[1] { LazyJavaClassifierType@87['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@68['PrintStream'] {
-    parameters = ArrayList@86[empty]
-    supertypes = ArrayList@87[3] { LazyJavaClassifierType@88['FilterOutputStream'], LazyJavaClassifierType@89['Appendable'], LazyJavaClassifierType@90['Closeable'] }
+LazyJavaClassTypeConstructor@70['PrintStream'] {
+    parameters = ArrayList@88[empty]
+    supertypes = ArrayList@89[3] { LazyJavaClassifierType@90['FilterOutputStream'], LazyJavaClassifierType@91['Appendable'], LazyJavaClassifierType@92['Closeable'] }
 }
 
-LazyJavaClassifierType@89['Appendable'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@92['Appendable']
+LazyJavaClassifierType@91['Appendable'] {
+    arguments = ArrayList@93[empty]
+    classifier = JavaClassImpl@94['Appendable']
     memberScope = LazyJavaClassMemberScope@7
     typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
 }
 
-LazyJavaClassifierType@76['AutoCloseable'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@94['AutoCloseable']
+LazyJavaClassifierType@78['AutoCloseable'] {
+    arguments = ArrayList@95[empty]
+    classifier = JavaClassImpl@96['AutoCloseable']
     memberScope = LazyJavaClassMemberScope@16
-    nullable = 'false': Boolean@95
+    nullable = 'false': Boolean@97
     typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
 }
 
-LazyJavaClassifierType@85['Closeable'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@97['Closeable']
-    memberScope = LazyJavaClassMemberScope@25
-    nullable = 'false': Boolean@95
-    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
-}
-
-LazyJavaClassifierType@90['Closeable'] {
+LazyJavaClassifierType@87['Closeable'] {
     arguments = ArrayList@98[empty]
     classifier = JavaClassImpl@99['Closeable']
     memberScope = LazyJavaClassMemberScope@25
+    nullable = 'false': Boolean@97
     typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
 }
 
-LazyJavaClassifierType@82['Closeable'] {
+LazyJavaClassifierType@84['Closeable'] {
     arguments = ArrayList@100[empty]
     classifier = JavaClassImpl@101['Closeable']
     memberScope = LazyJavaClassMemberScope@25
     typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
 }
 
-LazyJavaClassifierType@88['FilterOutputStream'] {
+LazyJavaClassifierType@92['Closeable'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@103['FilterOutputStream']
+    classifier = JavaClassImpl@103['Closeable']
+    memberScope = LazyJavaClassMemberScope@25
+    typeConstructor = LazyJavaClassTypeConstructor@27['Closeable']
+}
+
+LazyJavaClassifierType@90['FilterOutputStream'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaClassImpl@105['FilterOutputStream']
     memberScope = LazyJavaClassMemberScope@32
     typeConstructor = LazyJavaClassTypeConstructor@34['FilterOutputStream']
 }
 
-LazyJavaClassifierType@104['Flushable'] {
+LazyJavaClassifierType@106['Flushable'] {
     classifier = null
-    typeConstructor = TypeConstructorImpl$1@105
+    typeConstructor = TypeConstructorImpl$1@107
 }
 
-LazyJavaClassifierType@106['Object'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@108['Object']
-    nullable = 'false': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@109
+LazyJavaClassifierType@108['Object'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaClassImpl@110['Object']
+    nullable = 'false': Boolean@97
+    typeConstructor = DeserializedClassTypeConstructor@111
 }
 
-LazyJavaClassifierType@110['Object'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaClassImpl@108['Object']
-    nullable = 'true': Boolean@112
-    typeConstructor = DeserializedClassTypeConstructor@109
-}
-
-LazyJavaClassifierType@113['Object'] {
-    classifier = JavaClassImpl@114['Object']
-    typeConstructor = DeserializedClassTypeConstructor@109
+LazyJavaClassifierType@112['Object'] {
+    arguments = ArrayList@113[empty]
+    classifier = JavaClassImpl@110['Object']
+    nullable = 'true': Boolean@114
+    typeConstructor = DeserializedClassTypeConstructor@111
 }
 
 LazyJavaClassifierType@115['Object'] {
     classifier = JavaClassImpl@116['Object']
-    typeConstructor = DeserializedClassTypeConstructor@109
+    typeConstructor = DeserializedClassTypeConstructor@111
 }
 
 LazyJavaClassifierType@117['Object'] {
     classifier = JavaClassImpl@118['Object']
-    typeConstructor = DeserializedClassTypeConstructor@109
+    typeConstructor = DeserializedClassTypeConstructor@111
 }
 
 LazyJavaClassifierType@119['Object'] {
     classifier = JavaClassImpl@120['Object']
-    typeConstructor = DeserializedClassTypeConstructor@109
+    typeConstructor = DeserializedClassTypeConstructor@111
 }
 
-LazyJavaClassifierType@79['OutputStream'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['OutputStream']
-    memberScope = LazyJavaClassMemberScope@52
-    nullable = 'false': Boolean@95
-    typeConstructor = LazyJavaClassTypeConstructor@54['OutputStream']
+LazyJavaClassifierType@121['Object'] {
+    classifier = JavaClassImpl@122['Object']
+    typeConstructor = DeserializedClassTypeConstructor@111
 }
 
-LazyJavaClassifierType@123['String'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['String']
-    nullable = 'false': Boolean@95
-    typeConstructor = DeserializedClassTypeConstructor@126
+LazyJavaClassifierType@81['OutputStream'] {
+    arguments = ArrayList@123[empty]
+    classifier = JavaClassImpl@124['OutputStream']
+    memberScope = LazyJavaClassMemberScope@53
+    nullable = 'false': Boolean@97
+    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
 }
 
-LazyJavaClassifierType@127['String'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@125['String']
-    nullable = 'true': Boolean@112
-    typeConstructor = DeserializedClassTypeConstructor@126
+LazyJavaClassifierType@125['String'] {
+    arguments = ArrayList@126[empty]
+    classifier = JavaClassImpl@127['String']
+    nullable = 'false': Boolean@97
+    typeConstructor = DeserializedClassTypeConstructor@128
 }
 
-LazyJavaPackageFragmentProvider@129 {
-    packageFragments('<root>': FqName@130) = LazyJavaPackageFragment@131['<root>']
-    packageFragments('Int': FqName@132) = null
-    packageFragments('String': FqName@133) = null
-    packageFragments('java': FqName@134) = LazyJavaPackageFragment@135['java']
-    packageFragments('java.io': FqName@136) = LazyJavaPackageFragment@137['io']
-    packageFragments('java.io.InputStream': FqName@138) = null
-    packageFragments('java.io.PrintStream': FqName@139) = null
-    packageFragments('java.lang': FqName@140) = LazyJavaPackageFragment@141['lang']
-    packageFragments('java.lang.Int': FqName@142) = null
-    packageFragments('java.lang.String': FqName@143) = null
-    packageFragments('kotlin': FqName@144) = null
-    packageFragments('kotlin.Int': FqName@145) = null
-    packageFragments('kotlin.String': FqName@146) = null
-    packageFragments('kotlin.io': FqName@147) = null
-    packageFragments('kotlin.jvm': FqName@148) = null
-    topLevelClasses(JavaClassImpl@92['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@94['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
-    topLevelClasses(JavaClassImpl@99['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
-    topLevelClasses(JavaClassImpl@103['FilterOutputStream']) = LazyJavaClassDescriptor@28['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@149['InputStream']) = LazyJavaClassDescriptor@35['InputStream']
-    topLevelClasses(JavaClassImpl@122['OutputStream']) = LazyJavaClassDescriptor@49['OutputStream']
-    topLevelClasses(JavaClassImpl@150['PrintStream']) = LazyJavaClassDescriptor@55['PrintStream']
+LazyJavaClassifierType@129['String'] {
+    arguments = ArrayList@130[empty]
+    classifier = JavaClassImpl@127['String']
+    nullable = 'true': Boolean@114
+    typeConstructor = DeserializedClassTypeConstructor@128
 }
 
-LazyJavaPackageFragment@131['<root>'] {
-    classes('Int': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('String': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('Unit': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('compareTo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('equals': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('get': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('java': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('not': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('plus': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('println': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('read': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('compareTo': Name@155) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('equals': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('get': Name@156) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('not': Name@158) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('plus': Name@159) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('println': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('read': Name@19) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@152
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@152
+LazyJavaPackageFragmentProvider@131 {
+    packageFragments('<root>': FqName@132) = LazyJavaPackageFragment@133['<root>']
+    packageFragments('Int': FqName@134) = null
+    packageFragments('String': FqName@135) = null
+    packageFragments('java': FqName@136) = LazyJavaPackageFragment@137['java']
+    packageFragments('java.io': FqName@138) = LazyJavaPackageFragment@139['io']
+    packageFragments('java.io.InputStream': FqName@140) = null
+    packageFragments('java.io.PrintStream': FqName@141) = null
+    packageFragments('java.lang': FqName@142) = LazyJavaPackageFragment@143['lang']
+    packageFragments('java.lang.Int': FqName@144) = null
+    packageFragments('java.lang.String': FqName@145) = null
+    packageFragments('kotlin': FqName@146) = null
+    packageFragments('kotlin.Int': FqName@147) = null
+    packageFragments('kotlin.String': FqName@148) = null
+    packageFragments('kotlin.io': FqName@149) = null
+    packageFragments('kotlin.jvm': FqName@150) = null
+    topLevelClasses(JavaClassImpl@94['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
+    topLevelClasses(JavaClassImpl@96['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
+    topLevelClasses(JavaClassImpl@103['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
+    topLevelClasses(JavaClassImpl@105['FilterOutputStream']) = LazyJavaClassDescriptor@28['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@151['InputStream']) = LazyJavaClassDescriptor@35['InputStream']
+    topLevelClasses(JavaClassImpl@124['OutputStream']) = LazyJavaClassDescriptor@50['OutputStream']
+    topLevelClasses(JavaClassImpl@152['PrintStream']) = LazyJavaClassDescriptor@56['PrintStream']
 }
 
-LazyJavaPackageFragment@137['io'] {
-    classes('InputStream': Name@162) = LazyJavaClassDescriptor@35['InputStream'] // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('PrintStream': Name@164) = LazyJavaClassDescriptor@55['PrintStream'] // through LazyPackageFragmentScopeForJavaPackage@163
+LazyJavaPackageFragment@133['<root>'] {
+    classes('Int': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('String': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('Unit': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('equals': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('get': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('java': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('println': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('read': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@154
+    functions('equals': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
+    functions('get': Name@157) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
+    functions('println': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
+    functions('read': Name@19) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@154
+    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@154
 }
 
-LazyJavaPackageFragment@135['java'] {
-    classes('io': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    classes('lang': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('lang': Name@168) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    memberIndex = computeMemberIndex$1@169 // through LazyPackageFragmentScopeForJavaPackage@166
+LazyJavaPackageFragment@139['io'] {
+    classes('InputStream': Name@161) = LazyJavaClassDescriptor@35['InputStream'] // through LazyPackageFragmentScopeForJavaPackage@162
+    classes('PrintStream': Name@163) = LazyJavaClassDescriptor@56['PrintStream'] // through LazyPackageFragmentScopeForJavaPackage@162
 }
 
-LazyJavaPackageFragment@141['lang'] {
-    classes('compareTo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('equals': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('get': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('java': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('not': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('plus': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('println': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('read': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('compareTo': Name@155) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('equals': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('get': Name@156) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('not': Name@158) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('plus': Name@159) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('println': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('read': Name@19) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@170
+LazyJavaPackageFragment@137['java'] {
+    classes('io': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@165
+    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@165
+    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@165
+    functions('lang': Name@167) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@165
+    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@165
+}
+
+LazyJavaPackageFragment@143['lang'] {
+    classes('equals': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('get': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('java': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('println': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('read': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('equals': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('get': Name@157) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('println': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('read': Name@19) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@169
+}
+
+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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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[10] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
+    <name not found> = ArrayList@332[10] { ResolutionCandidate@329, ResolutionCandidate@330, ResolutionCandidate@331, ... }
+}
+
+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@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@345 {
+    <name not found> = ArrayList@346[1] { ResolutionCandidate@347 }
+    <name not found> = ArrayList@348[1] { ResolutionCandidate@347 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@9[empty]
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@373 {
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@375 }
+    <name not found> = ArrayList@376[1] { ResolutionCandidate@375 }
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@380 {
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@382 }
+    <name not found> = ArrayList@383[1] { ResolutionCandidate@382 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@9[empty]
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@408 {
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@410 }
+    <name not found> = ArrayList@411[1] { ResolutionCandidate@410 }
+    <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]
+}
+
+ResolutionTaskHolder@415 {
+    <name not found> = ArrayList@416[1] { ResolutionCandidate@417 }
+    <name not found> = ArrayList@418[1] { ResolutionCandidate@417 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@9[empty]
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@443 {
+    <name not found> = ArrayList@444[1] { ResolutionCandidate@445 }
+    <name not found> = ArrayList@446[1] { ResolutionCandidate@445 }
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@450 {
+    <name not found> = ArrayList@451[1] { ResolutionCandidate@452 }
+    <name not found> = ArrayList@453[1] { ResolutionCandidate@452 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@9[empty]
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@478 {
+    <name not found> = ArrayList@479[1] { ResolutionCandidate@480 }
+    <name not found> = ArrayList@481[1] { ResolutionCandidate@480 }
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@485 {
+    <name not found> = ArrayList@486[1] { ResolutionCandidate@487 }
+    <name not found> = ArrayList@488[1] { ResolutionCandidate@487 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@9[empty]
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@513 {
+    <name not found> = ArrayList@514[1] { ResolutionCandidate@515 }
+    <name not found> = ArrayList@516[1] { ResolutionCandidate@515 }
+    <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> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@520 {
+    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@9[empty]
+    <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> = 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 }
+    <name not found> = EmptyList@9[empty]
+    <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> = 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]
+    <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 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+}
+
+ResolutionTaskHolder@576 {
+    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
+    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
+    <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@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@597 {
+    <name not found> = ArrayList@598[1] { ResolutionCandidate@599 }
+    <name not found> = ArrayList@600[1] { ResolutionCandidate@599 }
+    <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@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@618 {
+    <name not found> = ArrayList@619[1] { ResolutionCandidate@620 }
+    <name not found> = ArrayList@621[1] { ResolutionCandidate@620 }
+    <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@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@639 {
+    <name not found> = ArrayList@640[1] { ResolutionCandidate@641 }
+    <name not found> = ArrayList@642[1] { ResolutionCandidate@641 }
+    <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@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@660 {
+    <name not found> = ArrayList@661[1] { ResolutionCandidate@662 }
+    <name not found> = ArrayList@663[1] { ResolutionCandidate@662 }
+    <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@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@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@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@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@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@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@707 {
+    <name not found> = ArrayList@708[1] { ResolutionCandidate@709 }
+    <name not found> = ArrayList@710[1] { ResolutionCandidate@709 }
+}
+
+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@719 {
+    <name not found> = ArrayList@720[1] { ResolutionCandidate@721 }
+    <name not found> = ArrayList@722[1] { ResolutionCandidate@721 }
+}
+
+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@731 {
+    <name not found> = ArrayList@732[1] { ResolutionCandidate@733 }
+    <name not found> = ArrayList@734[1] { ResolutionCandidate@733 }
+}
+
+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@743 {
+    <name not found> = ArrayList@744[1] { ResolutionCandidate@745 }
+    <name not found> = ArrayList@746[1] { ResolutionCandidate@745 }
+}
+
+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@755 {
+    <name not found> = ArrayList@756[1] { ResolutionCandidate@757 }
+    <name not found> = ArrayList@758[1] { ResolutionCandidate@757 }
+}
+
+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@767 {
+    <name not found> = ArrayList@768[1] { ResolutionCandidate@769 }
+    <name not found> = ArrayList@770[1] { ResolutionCandidate@769 }
+}
+
+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@779 {
+    <name not found> = ArrayList@780[1] { ResolutionCandidate@781 }
+    <name not found> = ArrayList@782[1] { ResolutionCandidate@781 }
+}
+
+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@791 {
+    <name not found> = ArrayList@792[1] { ResolutionCandidate@793 }
+    <name not found> = ArrayList@794[1] { ResolutionCandidate@793 }
+}
+
+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@803 {
+    <name not found> = ArrayList@804[1] { ResolutionCandidate@805 }
+    <name not found> = ArrayList@806[1] { ResolutionCandidate@805 }
+}
+
+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@815 {
+    <name not found> = ArrayList@816[1] { ResolutionCandidate@817 }
+    <name not found> = ArrayList@818[1] { ResolutionCandidate@817 }
+}
+
+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@827 {
+    <name not found> = ArrayList@828[1] { ResolutionCandidate@829 }
+    <name not found> = ArrayList@830[1] { ResolutionCandidate@829 }
+}
+
+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@839 {
+    <name not found> = ArrayList@840[1] { ResolutionCandidate@841 }
+    <name not found> = ArrayList@842[1] { ResolutionCandidate@841 }
+}
+
+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@851 {
+    <name not found> = ArrayList@852[1] { ResolutionCandidate@853 }
+    <name not found> = ArrayList@854[1] { ResolutionCandidate@853 }
+}
+
+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@863 {
+    <name not found> = ArrayList@864[1] { ResolutionCandidate@865 }
+    <name not found> = ArrayList@866[1] { ResolutionCandidate@865 }
+}
+
+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@875 {
+    <name not found> = ArrayList@876[1] { ResolutionCandidate@877 }
+    <name not found> = ArrayList@878[1] { ResolutionCandidate@877 }
+}
+
+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@887 {
+    <name not found> = ArrayList@888[1] { ResolutionCandidate@889 }
+    <name not found> = ArrayList@890[1] { ResolutionCandidate@889 }
+}
+
+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@899 {
+    <name not found> = ArrayList@900[1] { ResolutionCandidate@901 }
+    <name not found> = ArrayList@902[1] { ResolutionCandidate@901 }
+}
+
+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@911 {
+    <name not found> = ArrayList@912[1] { ResolutionCandidate@913 }
+    <name not found> = ArrayList@914[1] { ResolutionCandidate@913 }
+}
+
+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@923 {
+    <name not found> = ArrayList@924[1] { ResolutionCandidate@925 }
+    <name not found> = ArrayList@926[1] { ResolutionCandidate@925 }
+}
+
+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@935 {
+    <name not found> = ArrayList@936[1] { ResolutionCandidate@937 }
+    <name not found> = ArrayList@938[1] { ResolutionCandidate@937 }
+}
+
+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@947 {
+    <name not found> = ArrayList@948[1] { ResolutionCandidate@949 }
+    <name not found> = ArrayList@950[1] { ResolutionCandidate@949 }
+}
+
+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@959 {
+    <name not found> = ArrayList@960[1] { ResolutionCandidate@961 }
+    <name not found> = ArrayList@962[1] { ResolutionCandidate@961 }
+}
+
+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@971 {
+    <name not found> = ArrayList@972[1] { ResolutionCandidate@973 }
+    <name not found> = ArrayList@974[1] { ResolutionCandidate@973 }
+}
+
+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@983 {
+    <name not found> = ArrayList@984[1] { ResolutionCandidate@985 }
+    <name not found> = ArrayList@986[1] { ResolutionCandidate@985 }
+}
+
+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@995 {
+    <name not found> = ArrayList@996[1] { ResolutionCandidate@997 }
+    <name not found> = ArrayList@998[1] { ResolutionCandidate@997 }
+}
+
+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@1007 {
+    <name not found> = ArrayList@1008[1] { ResolutionCandidate@1009 }
+    <name not found> = ArrayList@1010[1] { ResolutionCandidate@1009 }
+}
+
+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@1019 {
+    <name not found> = ArrayList@1020[1] { ResolutionCandidate@1021 }
+    <name not found> = ArrayList@1022[1] { ResolutionCandidate@1021 }
+}
+
+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@1031 {
+    <name not found> = ArrayList@1032[1] { ResolutionCandidate@1033 }
+    <name not found> = ArrayList@1034[1] { ResolutionCandidate@1033 }
+}
+
+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@1043 {
+    <name not found> = ArrayList@1044[1] { ResolutionCandidate@1045 }
+    <name not found> = ArrayList@1046[1] { ResolutionCandidate@1045 }
+}
+
+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@1055 {
+    <name not found> = ArrayList@1056[1] { ResolutionCandidate@1057 }
+    <name not found> = ArrayList@1058[1] { ResolutionCandidate@1057 }
+}
+
+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@1067 {
+    <name not found> = ArrayList@1068[1] { ResolutionCandidate@1069 }
+    <name not found> = ArrayList@1070[1] { ResolutionCandidate@1069 }
+}
+
+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@1079 {
+    <name not found> = ArrayList@1080[1] { ResolutionCandidate@1081 }
+    <name not found> = ArrayList@1082[1] { ResolutionCandidate@1081 }
+}
+
+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@1091 {
+    <name not found> = ArrayList@1092[1] { ResolutionCandidate@1093 }
+    <name not found> = ArrayList@1094[1] { ResolutionCandidate@1093 }
+}
+
+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@1103 {
+    <name not found> = ArrayList@1104[1] { ResolutionCandidate@1105 }
+    <name not found> = ArrayList@1106[1] { ResolutionCandidate@1105 }
+}
+
+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@1115 {
+    <name not found> = ArrayList@1116[1] { ResolutionCandidate@1117 }
+    <name not found> = ArrayList@1118[1] { ResolutionCandidate@1117 }
+}
+
+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@1127 {
+    <name not found> = ArrayList@1128[1] { ResolutionCandidate@1129 }
+    <name not found> = ArrayList@1130[1] { ResolutionCandidate@1129 }
+}
+
+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@1139 {
+    <name not found> = ArrayList@1140[1] { ResolutionCandidate@1141 }
+    <name not found> = ArrayList@1142[1] { ResolutionCandidate@1141 }
+}
+
+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@1151 {
+    <name not found> = ArrayList@1152[1] { ResolutionCandidate@1153 }
+    <name not found> = ArrayList@1154[1] { ResolutionCandidate@1153 }
+}
+
+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@1163 {
+    <name not found> = ArrayList@1164[1] { ResolutionCandidate@1165 }
+    <name not found> = ArrayList@1166[1] { ResolutionCandidate@1165 }
+}
+
+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@1175 {
+    <name not found> = ArrayList@1176[1] { ResolutionCandidate@1177 }
+    <name not found> = ArrayList@1178[1] { ResolutionCandidate@1177 }
+}
+
+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@1187 {
+    <name not found> = ArrayList@1188[1] { ResolutionCandidate@1189 }
+    <name not found> = ArrayList@1190[1] { ResolutionCandidate@1189 }
+}
+
+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@1199 {
+    <name not found> = ArrayList@1200[1] { ResolutionCandidate@1201 }
+    <name not found> = ArrayList@1202[1] { ResolutionCandidate@1201 }
+}
+
+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@1211 {
+    <name not found> = ArrayList@1212[1] { ResolutionCandidate@1213 }
+    <name not found> = ArrayList@1214[1] { ResolutionCandidate@1213 }
+}
+
+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@1223 {
+    <name not found> = ArrayList@1224[1] { ResolutionCandidate@1225 }
+    <name not found> = ArrayList@1226[1] { ResolutionCandidate@1225 }
+}
+
+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@1235 {
+    <name not found> = ArrayList@1236[1] { ResolutionCandidate@1237 }
+    <name not found> = ArrayList@1238[1] { ResolutionCandidate@1237 }
+}
+
+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@1247 {
+    <name not found> = ArrayList@1248[1] { ResolutionCandidate@1249 }
+    <name not found> = ArrayList@1250[1] { ResolutionCandidate@1249 }
+}
+
+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@1259 {
+    <name not found> = ArrayList@1260[1] { ResolutionCandidate@1261 }
+    <name not found> = ArrayList@1262[1] { ResolutionCandidate@1261 }
+}
+
+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@1271 {
+    <name not found> = ArrayList@1272[1] { ResolutionCandidate@1273 }
+    <name not found> = ArrayList@1274[1] { ResolutionCandidate@1273 }
+}
+
+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@1283 {
+    <name not found> = ArrayList@1284[1] { ResolutionCandidate@1285 }
+    <name not found> = ArrayList@1286[1] { ResolutionCandidate@1285 }
+}
+
+ResolutionTaskHolder@1287 {
+    <name not found> = ArrayList@1288[1] { ResolutionCandidate@1289 }
+    <name not found> = ArrayList@1290[1] { ResolutionCandidate@1289 }
+}
+
+ResolutionTaskHolder@1291 {
+    <name not found> = ArrayList@1292[1] { ResolutionCandidate@1293 }
+    <name not found> = ArrayList@1294[1] { ResolutionCandidate@1293 }
+}
+
+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@1303 {
+    <name not found> = ArrayList@1304[1] { ResolutionCandidate@1305 }
+    <name not found> = ArrayList@1306[1] { ResolutionCandidate@1305 }
+}
+
+ResolutionTaskHolder@1307 {
+    <name not found> = ArrayList@1308[1] { ResolutionCandidate@1309 }
+    <name not found> = ArrayList@1310[1] { ResolutionCandidate@1309 }
+}
+
+ResolutionTaskHolder@1311 {
+    <name not found> = ArrayList@1312[1] { ResolutionCandidate@1313 }
+    <name not found> = ArrayList@1314[1] { ResolutionCandidate@1313 }
+}
+
+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@1323 {
+    <name not found> = ArrayList@1324[1] { ResolutionCandidate@1325 }
+    <name not found> = ArrayList@1326[1] { ResolutionCandidate@1325 }
+}
+
+ResolutionTaskHolder@1327 {
+    <name not found> = ArrayList@1328[1] { ResolutionCandidate@1329 }
+    <name not found> = ArrayList@1330[1] { ResolutionCandidate@1329 }
+}
+
+ResolutionTaskHolder@1331 {
+    <name not found> = ArrayList@1332[1] { ResolutionCandidate@1333 }
+    <name not found> = ArrayList@1334[1] { ResolutionCandidate@1333 }
+}
+
+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@1343 {
+    <name not found> = ArrayList@1344[1] { ResolutionCandidate@1345 }
+    <name not found> = ArrayList@1346[1] { ResolutionCandidate@1345 }
+}
+
+ResolutionTaskHolder@1347 {
+    <name not found> = ArrayList@1348[1] { ResolutionCandidate@1349 }
+    <name not found> = ArrayList@1350[1] { ResolutionCandidate@1349 }
+}
+
+ResolutionTaskHolder@1351 {
+    <name not found> = ArrayList@1352[1] { ResolutionCandidate@1353 }
+    <name not found> = ArrayList@1354[1] { ResolutionCandidate@1353 }
+}
+
+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@1363 {
+    <name not found> = ArrayList@1364[1] { ResolutionCandidate@1365 }
+    <name not found> = ArrayList@1366[1] { ResolutionCandidate@1365 }
+}
+
+ResolutionTaskHolder@1367 {
+    <name not found> = ArrayList@1368[1] { ResolutionCandidate@1369 }
+    <name not found> = ArrayList@1370[1] { ResolutionCandidate@1369 }
+}
+
+ResolutionTaskHolder@1371 {
+    <name not found> = ArrayList@1372[1] { ResolutionCandidate@1373 }
+    <name not found> = ArrayList@1374[1] { ResolutionCandidate@1373 }
+}
+
+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@1383 {
+    <name not found> = ArrayList@1384[1] { ResolutionCandidate@1385 }
+    <name not found> = ArrayList@1386[1] { ResolutionCandidate@1385 }
+}
+
+ResolutionTaskHolder@1387 {
+    <name not found> = ArrayList@1388[1] { ResolutionCandidate@1389 }
+    <name not found> = ArrayList@1390[1] { ResolutionCandidate@1389 }
+}
+
+ResolutionTaskHolder@1391 {
+    <name not found> = ArrayList@1392[1] { ResolutionCandidate@1393 }
+    <name not found> = ArrayList@1394[1] { ResolutionCandidate@1393 }
+}
+
+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@1403 {
+    <name not found> = ArrayList@1404[1] { ResolutionCandidate@1405 }
+    <name not found> = ArrayList@1406[1] { ResolutionCandidate@1405 }
+}
+
+ResolutionTaskHolder@1407 {
+    <name not found> = ArrayList@1408[1] { ResolutionCandidate@1409 }
+    <name not found> = ArrayList@1410[1] { ResolutionCandidate@1409 }
+}
+
+ResolutionTaskHolder@1411 {
+    <name not found> = ArrayList@1412[1] { ResolutionCandidate@1413 }
+    <name not found> = ArrayList@1414[1] { ResolutionCandidate@1413 }
+}
+
+ResolutionTaskHolder@1415 {
+    <name not found> = ArrayList@1416[1] { ResolutionCandidate@1417 }
+    <name not found> = ArrayList@1418[1] { ResolutionCandidate@1417 }
+}
+
+ResolutionTaskHolder@1419 {
+    <name not found> = ArrayList@1420[1] { ResolutionCandidate@1421 }
+    <name not found> = ArrayList@1422[1] { ResolutionCandidate@1421 }
+}
+
+ResolutionTaskHolder@1423 {
+    <name not found> = ArrayList@1424[1] { ResolutionCandidate@1425 }
+    <name not found> = ArrayList@1426[1] { ResolutionCandidate@1425 }
+}
+
+ResolutionTaskHolder@1427 {
+    <name not found> = ArrayList@1428[1] { ResolutionCandidate@1429 }
+    <name not found> = ArrayList@1430[1] { ResolutionCandidate@1429 }
+}
+
+ResolutionTaskHolder@1431 {
+    <name not found> = ArrayList@1432[1] { ResolutionCandidate@1433 }
+    <name not found> = ArrayList@1434[1] { ResolutionCandidate@1433 }
+}
+
+ResolutionTaskHolder@1435 {
+    <name not found> = ArrayList@1436[1] { ResolutionCandidate@1437 }
+    <name not found> = ArrayList@1438[1] { ResolutionCandidate@1437 }
+}
+
+ResolutionTaskHolder@1439 {
+    <name not found> = ArrayList@1440[1] { ResolutionCandidate@1441 }
+    <name not found> = ArrayList@1442[1] { ResolutionCandidate@1441 }
+}
+
+ResolutionTaskHolder@1443 {
+    <name not found> = ArrayList@1444[1] { ResolutionCandidate@1445 }
+    <name not found> = ArrayList@1446[1] { ResolutionCandidate@1445 }
+}
+
+ResolutionTaskHolder@1447 {
+    <name not found> = ArrayList@1448[1] { ResolutionCandidate@1449 }
+    <name not found> = ArrayList@1450[1] { ResolutionCandidate@1449 }
+}
+
+ResolutionTaskHolder@1451 {
+    <name not found> = ArrayList@1452[1] { ResolutionCandidate@1453 }
+    <name not found> = ArrayList@1454[1] { ResolutionCandidate@1453 }
+}
+
+ResolutionTaskHolder@1455 {
+    <name not found> = ArrayList@1456[1] { ResolutionCandidate@1457 }
+    <name not found> = ArrayList@1458[1] { ResolutionCandidate@1457 }
+}
+
+ResolutionTaskHolder@1459 {
+    <name not found> = ArrayList@1460[1] { ResolutionCandidate@1461 }
+    <name not found> = ArrayList@1462[1] { ResolutionCandidate@1461 }
+}
+
+ResolutionTaskHolder@1463 {
+    <name not found> = ArrayList@1464[1] { ResolutionCandidate@1465 }
+    <name not found> = ArrayList@1466[1] { ResolutionCandidate@1465 }
+}
+
+ResolutionTaskHolder@1467 {
+    <name not found> = ArrayList@1468[1] { ResolutionCandidate@1469 }
+    <name not found> = ArrayList@1470[1] { ResolutionCandidate@1469 }
+}
+
+ResolutionTaskHolder@1471 {
+    <name not found> = ArrayList@1472[1] { ResolutionCandidate@1473 }
+    <name not found> = ArrayList@1474[1] { ResolutionCandidate@1473 }
+}
+
+ResolutionTaskHolder@1475 {
+    <name not found> = ArrayList@1476[1] { ResolutionCandidate@1477 }
+    <name not found> = ArrayList@1478[1] { ResolutionCandidate@1477 }
+}
+
+ResolutionTaskHolder@1479 {
+    <name not found> = ArrayList@1480[1] { ResolutionCandidate@1481 }
+    <name not found> = ArrayList@1482[1] { ResolutionCandidate@1481 }
+}
+
+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@1491 {
+    <name not found> = ArrayList@1492[1] { ResolutionCandidate@1493 }
+    <name not found> = ArrayList@1494[1] { ResolutionCandidate@1493 }
+}
+
+ResolutionTaskHolder@1495 {
+    <name not found> = ArrayList@1496[1] { ResolutionCandidate@1497 }
+    <name not found> = ArrayList@1498[1] { ResolutionCandidate@1497 }
+}
+
+ResolutionTaskHolder@1499 {
+    <name not found> = ArrayList@1500[1] { ResolutionCandidate@1501 }
+    <name not found> = ArrayList@1502[1] { ResolutionCandidate@1501 }
+}
+
+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@1511 {
+    <name not found> = ArrayList@1512[1] { ResolutionCandidate@1513 }
+    <name not found> = ArrayList@1514[1] { ResolutionCandidate@1513 }
+}
+
+ResolutionTaskHolder@1515 {
+    <name not found> = ArrayList@1516[1] { ResolutionCandidate@1517 }
+    <name not found> = ArrayList@1518[1] { ResolutionCandidate@1517 }
+}
+
+ResolutionTaskHolder@1519 {
+    <name not found> = ArrayList@1520[1] { ResolutionCandidate@1521 }
+    <name not found> = ArrayList@1522[1] { ResolutionCandidate@1521 }
+}
+
+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@1531 {
+    <name not found> = ArrayList@1532[1] { ResolutionCandidate@1533 }
+    <name not found> = ArrayList@1534[1] { ResolutionCandidate@1533 }
+}
+
+ResolutionTaskHolder@1535 {
+    <name not found> = ArrayList@1536[1] { ResolutionCandidate@1537 }
+    <name not found> = ArrayList@1538[1] { ResolutionCandidate@1537 }
+}
+
+ResolutionTaskHolder@1539 {
+    <name not found> = ArrayList@1540[1] { ResolutionCandidate@1541 }
+    <name not found> = ArrayList@1542[1] { ResolutionCandidate@1541 }
+}
+
+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@1551 {
+    <name not found> = ArrayList@1552[1] { ResolutionCandidate@1553 }
+    <name not found> = ArrayList@1554[1] { ResolutionCandidate@1553 }
+}
+
+ResolutionTaskHolder@1555 {
+    <name not found> = ArrayList@1556[1] { ResolutionCandidate@1557 }
+    <name not found> = ArrayList@1558[1] { ResolutionCandidate@1557 }
+}
+
+ResolutionTaskHolder@1559 {
+    <name not found> = ArrayList@1560[1] { ResolutionCandidate@1561 }
+    <name not found> = ArrayList@1562[1] { ResolutionCandidate@1561 }
+}
+
+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@1571 {
+    <name not found> = ArrayList@1572[1] { ResolutionCandidate@1573 }
+    <name not found> = ArrayList@1574[1] { ResolutionCandidate@1573 }
+}
+
+ResolutionTaskHolder@1575 {
+    <name not found> = ArrayList@1576[1] { ResolutionCandidate@1577 }
+    <name not found> = ArrayList@1578[1] { ResolutionCandidate@1577 }
+}
+
+ResolutionTaskHolder@1579 {
+    <name not found> = ArrayList@1580[1] { ResolutionCandidate@1581 }
+    <name not found> = ArrayList@1582[1] { ResolutionCandidate@1581 }
+}
+
+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 }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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 6014d899bc9..a0de1a0c2a3 100644
--- a/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
+++ b/compiler/testData/diagnostics/tests/OverrideFunctionWithParamDefaultValue.lazy.log
@@ -17,25 +17,45 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('C': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('foo2': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('C': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('foo2': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('C': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('C': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo2': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('C': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo2': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('C': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('C': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log b/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
index a695464ab17..38412ff5c13 100644
--- a/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/OverridenFunctionAndSpecifiedTypeParameter.lazy.log
@@ -24,25 +24,40 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Bbb': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('Double': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('Unit': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('zzz': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Bbb': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('zzz': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Bbb': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Bbb': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('zzz': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('Bbb': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('zzz': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('Bbb': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('Bbb': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
diff --git a/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log b/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
index 2114d8778f7..cec1d7f71c8 100644
--- a/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/OverridingVarByVal.lazy.log
@@ -32,3 +32,13 @@ LazyJavaPackageFragment@11['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 }
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log b/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
index 04ae9baa67b..6934818855f 100644
--- a/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/PackageAsExpression.lazy.log
@@ -27,3 +27,16 @@ LazyJavaPackageFragment@9['lang'] {
     classes('a': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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/PackageInExpressionPosition.lazy.log b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
index e70d271836d..b123fbdc08b 100644
--- a/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/PackageInExpressionPosition.lazy.log
@@ -73,11 +73,385 @@ LazyJavaPackageFragment@43['java'] {
 
 LazyJavaPackageFragment@45['lang'] {
     classes('System': Name@66) = LazyJavaClassDescriptor@10['System'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('contains': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('foo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('java': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('foo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('java': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
     deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('System': Name@71) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('contains': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('System': Name@70) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@67
+}
+
+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]
+    <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]
+}
+
+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@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@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]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[empty]
+}
+
+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]
+    <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> = 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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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@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 {
+    <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 f5a56421ae7..c1c5497730c 100644
--- a/compiler/testData/diagnostics/tests/PackageQualified.lazy.log
+++ b/compiler/testData/diagnostics/tests/PackageQualified.lazy.log
@@ -118,37 +118,269 @@ LazyJavaPackageFragment@60['lang'] {
     classes('ArrayList': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@105
     classes('StrangeIterateeImpl': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
     classes('a': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('done': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foobar': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('hasNext': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('iterator': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('next': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('obj': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('process': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('util': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('foobar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('obj': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('util': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
     deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@105
     functions('StrangeIterateeImpl': Name@106) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('done': Name@108) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('hasNext': Name@110) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('iterator': Name@111) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('next': Name@112) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('process': Name@114) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
 LazyJavaPackageFragment@74['util'] {
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('List': Name@119) = LazyJavaClassDescriptor@7['List'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('a': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('util': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@118
+    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
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaTypeParameterDescriptor@10['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
-    upperBounds = LinkedHashSet@123[1] { NullableType@124 }
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    upperBounds = LinkedHashSet@116[1] { NullableType@117 }
 }
 
-LazyJavaTypeParameterResolver@125 {
-    resolve(JavaTypeParameterImpl@126['E']) = LazyJavaTypeParameterDescriptor@10['E']
+LazyJavaTypeParameterResolver@118 {
+    resolve(JavaTypeParameterImpl@119['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]
+    <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@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 }
+    <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]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
+    <name not found> = EmptyList@102[empty]
+    <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]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
+    <name not found> = EmptyList@102[empty]
+    <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@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> = 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> = 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]
+    <name not found> = EmptyList@102[empty]
+}
+
+ResolutionTaskHolder@237 {
+    <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@238 {
+    <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 2abf6d9ca8b..e9ef52f68d7 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@34['String']
+    classifier = JavaClassImpl@29['String']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@31
 }
 
 LazyJavaClassifierType@38['String'] {
     arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@29['String']
+    classifier = JavaClassImpl@34['String']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@31
 }
@@ -88,14 +88,14 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@46['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@43
 }
 
 LazyJavaClassifierType@49['Throwable'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@46['Throwable']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@43
 }
@@ -168,3 +168,58 @@ LazyJavaPackageFragment@69['lang'] {
     functions('UnsupportedOperationException': Name@92) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@100
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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/ProjectionOnFunctionArgumentErrror.lazy.log b/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
index 965c51094f2..3526a42c6ea 100644
--- a/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
+++ b/compiler/testData/diagnostics/tests/ProjectionOnFunctionArgumentErrror.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@7['lang'] {
     functions('foo': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 3b843ae81f3..adb882bc746 100644
--- a/compiler/testData/diagnostics/tests/Properties.lazy.log
+++ b/compiler/testData/diagnostics/tests/Properties.lazy.log
@@ -29,34 +29,174 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('Long': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('b': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('toInt': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('toLong': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('x': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('toInt': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('toLong': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('x': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('b': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toInt': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toLong': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('x': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toInt': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toLong': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('a': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('b': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('x': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+    <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]
+    <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]
+    <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@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]
+    <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@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]
+    <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]
+}
+
+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@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@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <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 74a3456cf28..16cf6b75439 100644
--- a/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
+++ b/compiler/testData/diagnostics/tests/PropertyInitializers.lazy.log
@@ -23,26 +23,142 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('b': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('b': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('b': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('b': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('b': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('b': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('b': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+    <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@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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 b6aacabc8fd..b49c9e6b43b 100644
--- a/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/QualifiedExpressions.lazy.log
@@ -32,10 +32,117 @@ LazyJavaPackageFragment@8['java'] {
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('minus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('startsWith': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('startsWith': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
     deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('minus': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('startsWith': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('startsWith': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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@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@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 }
+}
+
+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 }
+}
+
+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> = 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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log b/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
index 07117a0aecc..cb1c67829c8 100644
--- a/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/RecursiveTypeInference.lazy.log
@@ -3,12 +3,12 @@ DescriptorResolver@0 {
     <name not found> = ErrorTypeImpl@1
     <name not found> = ErrorTypeImpl@2
     <name not found> = ErrorTypeImpl@2
-    <name not found> = ErrorTypeImpl@3
+    <name not found> = ErrorTypeImpl@2
     <name not found> = ErrorTypeImpl@3
     <name not found> = ErrorTypeImpl@3
     <name not found> = JetTypeImpl@4['Int']
     <name not found> = JetTypeImpl@5['Int']
-    <name not found> = JetTypeImpl@6['Int']
+    <name not found> = JetTypeImpl@5['Int']
     <name not found> = JetTypeImpl@6['Int']
     <name not found> = null
 }
@@ -54,3 +54,125 @@ LazyJavaPackageFragment@18['lang'] {
     functions('foo': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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]
+    <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]
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <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 218e84e5c36..ac34575eae0 100644
--- a/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
+++ b/compiler/testData/diagnostics/tests/ReflectionTypesNotLoaded.lazy.log
@@ -19,26 +19,108 @@ LazyJavaPackageFragmentProvider@3 {
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    classes('baz': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('baz': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('baz': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('baz': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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@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]
+}
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <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 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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 55d98c74a95..7907ddd7e08 100644
--- a/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/ResolveOfJavaGenerics.lazy.log
@@ -84,14 +84,14 @@ LazyJavaClassifierType@49['T'] {
 
 LazyJavaClassifierType@52['T'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@47['T']
+    classifier = JavaTypeParameterImpl@51['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
 }
 
 LazyJavaClassifierType@54['T'] {
     arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@51['T']
+    classifier = JavaTypeParameterImpl@47['T']
     nullable = 'true': Boolean@40
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
 }
@@ -174,12 +174,12 @@ LazyJavaTypeParameterDescriptor@114['T'] {
     upperBoundsAsType = NullableType@116
 }
 
-LazyJavaTypeParameterDescriptor@27['T'] {
+LazyJavaTypeParameterDescriptor@23['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
     upperBounds = LinkedHashSet@118[1] { NullableType@119 }
 }
 
-LazyJavaTypeParameterDescriptor@23['T'] {
+LazyJavaTypeParameterDescriptor@27['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
     upperBounds = LinkedHashSet@121[1] { NullableType@122 }
 }
@@ -189,13 +189,109 @@ LazyJavaTypeParameterResolver@123 {
 }
 
 LazyJavaTypeParameterResolver@125 {
-    resolve(JavaTypeParameterImpl@126['T']) = LazyJavaTypeParameterDescriptor@27['T']
+    resolve(JavaTypeParameterImpl@126['T']) = LazyJavaTypeParameterDescriptor@23['T']
 }
 
 LazyJavaTypeParameterResolver@127 {
-    resolve(JavaTypeParameterImpl@128['T']) = LazyJavaTypeParameterDescriptor@114['T']
+    resolve(JavaTypeParameterImpl@128['T']) = LazyJavaTypeParameterDescriptor@27['T']
 }
 
 LazyJavaTypeParameterResolver@129 {
-    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@23['T']
+    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@114['T']
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 {
+    <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@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]
+    <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 {
+    <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]
+    <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 {
+    <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/ResolveToJava.lazy.log b/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
index 6db5ef76cdf..7a1065561e0 100644
--- a/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/ResolveToJava.lazy.log
@@ -9,129 +9,122 @@ LazyJavaClassDescriptor@2['AbstractList'] {
 LazyJavaClassDescriptor@4['Appendable'] {
     functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
-LazyJavaClassDescriptor@11['ArrayList'] {
-    constructors = ArrayList@12[3] { JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'] } // through LazyJavaClassMemberScope@16
-    defaultType = JetTypeImpl@17['ArrayList<1>']
+LazyJavaClassDescriptor@10['ArrayList'] {
+    constructors = ArrayList@11[3] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
+    defaultType = JetTypeImpl@16['ArrayList<1>']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@18['ArrayList']
+    typeConstructor = LazyJavaClassTypeConstructor@17['ArrayList']
 }
 
-LazyJavaClassDescriptor@19['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['AutoCloseable']
+LazyJavaClassDescriptor@18['AutoCloseable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@23['Charset'] {
+LazyJavaClassDescriptor@22['Charset'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@24['Charset']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
 }
 
-LazyJavaClassDescriptor@25['Class'] {
+LazyJavaClassDescriptor@24['Class'] {
     functionTypeForSamInterface = null
 }
 
-LazyJavaClassDescriptor@26['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@27
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@29['Closeable']
+LazyJavaClassDescriptor@25['Closeable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['Closeable']
 }
 
-LazyJavaClassDescriptor@30['Collections'] {
-    enumEntryIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@32
-    functions('emptyList': Name@33) = ArrayList@34[1] { JavaMethodDescriptor@35['emptyList'] } // through LazyJavaStaticClassScope@36
-    functions('emptyList': Name@33) = EmptyList@6[empty] // through LazyJavaClassMemberScope@32
-    functions('singleton': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@39['singleton'] } // through LazyJavaStaticClassScope@36
-    functions('singleton': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaStaticClassScope@36
-    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@32
-    nestedClasses('emptyList': Name@43) = null // through LazyJavaClassMemberScope@32
-    nestedClasses('singleton': Name@37) = null // through LazyJavaClassMemberScope@32
-    properties('emptyList': Name@43) = EmptyList@6[empty] // through LazyJavaClassMemberScope@32
-    properties('emptyList': Name@43) = EmptyList@6[empty] // through LazyJavaStaticClassScope@36
-    properties('singleton': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@32
-    properties('singleton': Name@37) = EmptyList@6[empty] // through LazyJavaStaticClassScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@44['Collections']
+LazyJavaClassDescriptor@29['Collections'] {
+    enumEntryIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@31
+    functions('emptyList': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['emptyList'] } // through LazyJavaStaticClassScope@35
+    functions('emptyList': Name@32) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
+    functions('singleton': Name@36) = ArrayList@37[1] { JavaMethodDescriptor@38['singleton'] } // through LazyJavaStaticClassScope@35
+    functions('singleton': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
+    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@31
+    memberIndex = computeMemberIndex$1@40 // through LazyJavaStaticClassScope@35
+    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@31
+    nestedClasses('emptyList': Name@42) = null // through LazyJavaClassMemberScope@31
+    nestedClasses('singleton': Name@36) = null // through LazyJavaClassMemberScope@31
+    properties('emptyList': Name@42) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
+    properties('emptyList': Name@42) = EmptyList@6[empty] // through LazyJavaStaticClassScope@35
+    properties('singleton': Name@36) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
+    properties('singleton': Name@36) = EmptyList@6[empty] // through LazyJavaStaticClassScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@43['Collections']
 }
 
-LazyJavaClassDescriptor@45['Comparable'] {
-    allDescriptors = ArrayList@46[4] { DeserializedSimpleFunctionDescriptor@47['hashCode'], DeserializedSimpleFunctionDescriptor@48['toString'], DeserializedSimpleFunctionDescriptor@49['equals'], ... } // through LazyJavaClassMemberScope@50
-    annotations = LazyJavaAnnotations@51
-    defaultType = JetTypeImpl@52['Comparable<1>']
-    enumEntryIndex = LinkedHashMap@53 // through LazyJavaClassMemberScope@50
-    functionTypeForSamInterface = JetTypeImpl@54['Function1<2>']
-    functions('clone': Name@55) = EmptyList@6[empty] // through LazyJavaClassMemberScope@50
-    functions('compareTo': Name@56) = ArrayList@57[1] { JavaMethodDescriptor@58['compareTo'] } // through LazyJavaClassMemberScope@50
-    functions('equals': Name@59) = ArrayList@60[1] { DeserializedSimpleFunctionDescriptor@49['equals'] } // through LazyJavaClassMemberScope@50
-    functions('finalize': Name@61) = EmptyList@6[empty] // through LazyJavaClassMemberScope@50
-    functions('getClass': Name@62) = EmptyList@6[empty] // through LazyJavaClassMemberScope@50
-    functions('hashCode': Name@63) = ArrayList@64[1] { DeserializedSimpleFunctionDescriptor@47['hashCode'] } // through LazyJavaClassMemberScope@50
-    functions('notify': Name@65) = EmptyList@6[empty] // through LazyJavaClassMemberScope@50
-    functions('notifyAll': Name@66) = EmptyList@6[empty] // through LazyJavaClassMemberScope@50
-    functions('toString': Name@67) = ArrayList@68[1] { DeserializedSimpleFunctionDescriptor@48['toString'] } // through LazyJavaClassMemberScope@50
-    functions('wait': Name@69) = EmptyList@6[empty] // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@70 // through LazyJavaClassMemberScope@50
-    nestedClassIndex = LinkedHashMap@71 // through LazyJavaClassMemberScope@50
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@72['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@73['Comparable']
+LazyJavaClassDescriptor@44['Comparable'] {
+    allDescriptors = ArrayList@45[4] { DeserializedSimpleFunctionDescriptor@46['hashCode'], DeserializedSimpleFunctionDescriptor@47['toString'], DeserializedSimpleFunctionDescriptor@48['equals'], ... } // through LazyJavaClassMemberScope@49
+    annotations = LazyJavaAnnotations@50
+    defaultType = JetTypeImpl@51['Comparable<1>']
+    enumEntryIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@49
+    functionTypeForSamInterface = JetTypeImpl@53['Function1<2>']
+    functions('clone': Name@54) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
+    functions('compareTo': Name@55) = ArrayList@56[1] { JavaMethodDescriptor@57['compareTo'] } // through LazyJavaClassMemberScope@49
+    functions('equals': Name@58) = ArrayList@59[1] { DeserializedSimpleFunctionDescriptor@48['equals'] } // through LazyJavaClassMemberScope@49
+    functions('finalize': Name@60) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
+    functions('getClass': Name@61) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
+    functions('hashCode': Name@62) = ArrayList@63[1] { DeserializedSimpleFunctionDescriptor@46['hashCode'] } // through LazyJavaClassMemberScope@49
+    functions('notify': Name@64) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
+    functions('notifyAll': Name@65) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
+    functions('toString': Name@66) = ArrayList@67[1] { DeserializedSimpleFunctionDescriptor@47['toString'] } // through LazyJavaClassMemberScope@49
+    functions('wait': Name@68) = EmptyList@6[empty] // through LazyJavaClassMemberScope@49
+    memberIndex = computeMemberIndex$1@69 // through LazyJavaClassMemberScope@49
+    nestedClassIndex = LinkedHashMap@70 // through LazyJavaClassMemberScope@49
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@71['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@72['Comparable']
 }
 
-LazyJavaClassDescriptor@74['Exception'] {
-    enumEntryIndex = LinkedHashMap@75 // through LazyJavaClassMemberScope@76
-    functions('getMessage': Name@77) = ArrayList@78[1] { DeserializedSimpleFunctionDescriptor@79['getMessage'] } // through LazyJavaClassMemberScope@76
-    memberIndex = computeMemberIndex$1@80 // through LazyJavaClassMemberScope@76
-    nestedClassIndex = LinkedHashMap@81 // through LazyJavaClassMemberScope@76
-    nestedClasses('getMessage': Name@77) = null // through LazyJavaClassMemberScope@76
-    properties('getMessage': Name@77) = EmptyList@6[empty] // through LazyJavaClassMemberScope@76
-    typeConstructor = LazyJavaClassTypeConstructor@82['Exception']
+LazyJavaClassDescriptor@73['Exception'] {
+    enumEntryIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@75
+    functions('getMessage': Name@76) = ArrayList@77[1] { DeserializedSimpleFunctionDescriptor@78['getMessage'] } // through LazyJavaClassMemberScope@75
+    memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@75
+    nestedClassIndex = LinkedHashMap@80 // through LazyJavaClassMemberScope@75
+    nestedClasses('getMessage': Name@76) = null // through LazyJavaClassMemberScope@75
+    typeConstructor = LazyJavaClassTypeConstructor@81['Exception']
 }
 
-LazyJavaClassDescriptor@83['File'] {
+LazyJavaClassDescriptor@82['File'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@84['File']
+    typeConstructor = LazyJavaClassTypeConstructor@83['File']
 }
 
-LazyJavaClassDescriptor@85['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@86
-    memberIndex = computeMemberIndex$1@87 // through LazyJavaClassMemberScope@86
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@86
-    typeConstructor = LazyJavaClassTypeConstructor@88['FilterOutputStream']
+LazyJavaClassDescriptor@84['FilterOutputStream'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@85
+    memberIndex = computeMemberIndex$1@86 // through LazyJavaClassMemberScope@85
+    typeConstructor = LazyJavaClassTypeConstructor@87['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@89['List'] {
+LazyJavaClassDescriptor@88['List'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@90['List']
+    typeConstructor = LazyJavaClassTypeConstructor@89['List']
 }
 
-LazyJavaClassDescriptor@91['Object'] {
-    typeConstructor = LazyJavaClassTypeConstructor@92['Object']
+LazyJavaClassDescriptor@90['Object'] {
+    typeConstructor = LazyJavaClassTypeConstructor@91['Object']
 }
 
-LazyJavaClassDescriptor@93['OutputStream'] {
+LazyJavaClassDescriptor@92['OutputStream'] {
     functionTypeForSamInterface = null
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@94
-    memberIndex = computeMemberIndex$1@95 // through LazyJavaClassMemberScope@94
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@94
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@93
+    memberIndex = computeMemberIndex$1@94 // through LazyJavaClassMemberScope@93
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
-LazyJavaClassDescriptor@97['PrintStream'] {
-    constructors = ArrayList@98[10] { JavaConstructorDescriptor@99['<init>'], JavaConstructorDescriptor@100['<init>'], JavaConstructorDescriptor@101['<init>'], ... } // through LazyJavaClassMemberScope@102
-    defaultType = JetTypeImpl@103['PrintStream']
-    enumEntryIndex = LinkedHashMap@104 // through LazyJavaClassMemberScope@102
+LazyJavaClassDescriptor@96['PrintStream'] {
+    constructors = ArrayList@97[10] { JavaConstructorDescriptor@98['<init>'], JavaConstructorDescriptor@99['<init>'], JavaConstructorDescriptor@100['<init>'], ... } // through LazyJavaClassMemberScope@101
+    defaultType = JetTypeImpl@102['PrintStream']
+    enumEntryIndex = LinkedHashMap@103 // through LazyJavaClassMemberScope@101
     functionTypeForSamInterface = null
-    functions('println': Name@9) = ArrayList@105[10] { JavaMethodDescriptor@106['println'], JavaMethodDescriptor@107['println'], JavaMethodDescriptor@108['println'], ... } // through LazyJavaClassMemberScope@102
-    memberIndex = computeMemberIndex$1@109 // through LazyJavaClassMemberScope@102
-    nestedClassIndex = LinkedHashMap@110 // through LazyJavaClassMemberScope@102
-    nestedClasses('println': Name@9) = null // through LazyJavaClassMemberScope@102
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@102
+    functions('println': Name@104) = ArrayList@105[10] { JavaMethodDescriptor@106['println'], JavaMethodDescriptor@107['println'], JavaMethodDescriptor@108['println'], ... } // through LazyJavaClassMemberScope@101
+    memberIndex = computeMemberIndex$1@109 // through LazyJavaClassMemberScope@101
+    nestedClassIndex = LinkedHashMap@110 // through LazyJavaClassMemberScope@101
+    nestedClasses('println': Name@104) = null // through LazyJavaClassMemberScope@101
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@111['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@112['PrintStream']
 }
@@ -164,63 +157,63 @@ LazyJavaClassTypeConstructor@3['AbstractList'] {
     supertypes = ArrayList@132[2] { LazyJavaClassifierType@133['AbstractCollection<E>'], LazyJavaClassifierType@134['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@10['Appendable'] {
+LazyJavaClassTypeConstructor@9['Appendable'] {
     parameters = ArrayList@135[empty]
     supertypes = ArrayList@136[1] { JetTypeImpl@137['Any'] }
 }
 
-LazyJavaClassTypeConstructor@18['ArrayList'] {
+LazyJavaClassTypeConstructor@17['ArrayList'] {
     parameters = ArrayList@138[1] { LazyJavaTypeParameterDescriptor@139['E'] }
     supertypes = ArrayList@140[5] { LazyJavaClassifierType@141['AbstractList<E>'], LazyJavaClassifierType@142['List<E>'], LazyJavaClassifierType@143['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@22['AutoCloseable'] {
+LazyJavaClassTypeConstructor@21['AutoCloseable'] {
     parameters = ArrayList@144[empty]
     supertypes = ArrayList@145[1] { JetTypeImpl@137['Any'] }
 }
 
-LazyJavaClassTypeConstructor@24['Charset'] {
+LazyJavaClassTypeConstructor@23['Charset'] {
     parameters = ArrayList@146[empty]
 }
 
-LazyJavaClassTypeConstructor@29['Closeable'] {
+LazyJavaClassTypeConstructor@28['Closeable'] {
     parameters = ArrayList@147[empty]
     supertypes = ArrayList@148[1] { LazyJavaClassifierType@149['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@44['Collections'] {
+LazyJavaClassTypeConstructor@43['Collections'] {
     supertypes = ArrayList@150[1] { JetTypeImpl@137['Any'] }
 }
 
-LazyJavaClassTypeConstructor@73['Comparable'] {
+LazyJavaClassTypeConstructor@72['Comparable'] {
     parameters = ArrayList@151[1] { LazyJavaTypeParameterDescriptor@152['T'] }
     supertypes = ArrayList@153[1] { JetTypeImpl@137['Any'] }
 }
 
-LazyJavaClassTypeConstructor@82['Exception'] {
+LazyJavaClassTypeConstructor@81['Exception'] {
     parameters = ArrayList@154[empty]
     supertypes = ArrayList@155[1] { LazyJavaClassifierType@156['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@84['File'] {
+LazyJavaClassTypeConstructor@83['File'] {
     parameters = ArrayList@157[empty]
 }
 
-LazyJavaClassTypeConstructor@88['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@87['FilterOutputStream'] {
     parameters = ArrayList@158[empty]
     supertypes = ArrayList@159[1] { LazyJavaClassifierType@160['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@90['List'] {
+LazyJavaClassTypeConstructor@89['List'] {
     parameters = ArrayList@161[1] { LazyJavaTypeParameterDescriptor@162['E'] }
 }
 
-LazyJavaClassTypeConstructor@92['Object'] {
+LazyJavaClassTypeConstructor@91['Object'] {
     parameters = ArrayList@163[empty]
     supertypes = ArrayList@164[1] { JetTypeImpl@137['Any'] }
 }
 
-LazyJavaClassTypeConstructor@96['OutputStream'] {
+LazyJavaClassTypeConstructor@95['OutputStream'] {
     parameters = ArrayList@165[empty]
     supertypes = ArrayList@166[1] { LazyJavaClassifierType@167['Closeable'] }
 }
@@ -249,42 +242,42 @@ LazyJavaClassifierType@171['Appendable'] {
     arguments = ArrayList@178[empty]
     classifier = JavaClassImpl@179['Appendable']
     memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
 LazyJavaClassifierType@149['AutoCloseable'] {
     arguments = ArrayList@180[empty]
     classifier = JavaClassImpl@181['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['AutoCloseable']
 }
 
 LazyJavaClassifierType@182['Charset'] {
     arguments = ArrayList@183[empty]
     classifier = JavaClassImpl@184['Charset']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@24['Charset']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
 }
 
 LazyJavaClassifierType@186['Charset'] {
     arguments = ArrayList@187[empty]
     classifier = JavaClassImpl@188['Charset']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@24['Charset']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
 }
 
 LazyJavaClassifierType@189['Charset'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaClassImpl@188['Charset']
+    classifier = JavaClassImpl@184['Charset']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@24['Charset']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
 }
 
 LazyJavaClassifierType@192['Charset'] {
     arguments = ArrayList@193[empty]
-    classifier = JavaClassImpl@184['Charset']
+    classifier = JavaClassImpl@188['Charset']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@24['Charset']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Charset']
 }
 
 LazyJavaClassifierType@194['Cloneable'] {
@@ -292,18 +285,18 @@ LazyJavaClassifierType@194['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@196
 }
 
-LazyJavaClassifierType@167['Closeable'] {
+LazyJavaClassifierType@172['Closeable'] {
     arguments = ArrayList@197[empty]
     classifier = JavaClassImpl@198['Closeable']
-    memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@29['Closeable']
+    memberScope = LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['Closeable']
 }
 
-LazyJavaClassifierType@172['Closeable'] {
+LazyJavaClassifierType@167['Closeable'] {
     arguments = ArrayList@199[empty]
     classifier = JavaClassImpl@200['Closeable']
-    memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@29['Closeable']
+    memberScope = LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['Closeable']
 }
 
 LazyJavaClassifierType@201['Collection<? extends E>'] {
@@ -338,84 +331,84 @@ LazyJavaClassifierType@217['E'] {
     arguments = ArrayList@218[empty]
     classifier = JavaTypeParameterImpl@219['E']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
-LazyJavaClassifierType@221['E'] {
-    arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@223['E']
+LazyJavaClassifierType@220['E'] {
+    arguments = ArrayList@221[empty]
+    classifier = JavaTypeParameterImpl@222['E']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@223
 }
 
 LazyJavaClassifierType@224['E'] {
     arguments = ArrayList@225[empty]
     classifier = JavaTypeParameterImpl@226['E']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
 LazyJavaClassifierType@227['E'] {
     arguments = ArrayList@228[empty]
-    classifier = JavaTypeParameterImpl@226['E']
+    classifier = JavaTypeParameterImpl@222['E']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@223
 }
 
 LazyJavaClassifierType@229['E'] {
     arguments = ArrayList@230[empty]
-    classifier = JavaTypeParameterImpl@223['E']
+    classifier = JavaTypeParameterImpl@226['E']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
 LazyJavaClassifierType@231['E'] {
     arguments = ArrayList@232[empty]
-    classifier = JavaTypeParameterImpl@215['E']
+    classifier = JavaTypeParameterImpl@219['E']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
 LazyJavaClassifierType@233['E'] {
     arguments = ArrayList@234[empty]
-    classifier = JavaTypeParameterImpl@219['E']
+    classifier = JavaTypeParameterImpl@215['E']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
 }
 
 LazyJavaClassifierType@235['File'] {
     arguments = ArrayList@236[empty]
     classifier = JavaClassImpl@237['File']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@84['File']
+    typeConstructor = LazyJavaClassTypeConstructor@83['File']
 }
 
 LazyJavaClassifierType@238['File'] {
     arguments = ArrayList@239[empty]
     classifier = JavaClassImpl@240['File']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@84['File']
+    typeConstructor = LazyJavaClassTypeConstructor@83['File']
 }
 
 LazyJavaClassifierType@241['File'] {
     arguments = ArrayList@242[empty]
-    classifier = JavaClassImpl@237['File']
+    classifier = JavaClassImpl@240['File']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@84['File']
+    typeConstructor = LazyJavaClassTypeConstructor@83['File']
 }
 
 LazyJavaClassifierType@243['File'] {
     arguments = ArrayList@244[empty]
-    classifier = JavaClassImpl@240['File']
+    classifier = JavaClassImpl@237['File']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@84['File']
+    typeConstructor = LazyJavaClassTypeConstructor@83['File']
 }
 
 LazyJavaClassifierType@170['FilterOutputStream'] {
     arguments = ArrayList@245[empty]
     classifier = JavaClassImpl@246['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@86
-    typeConstructor = LazyJavaClassTypeConstructor@88['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@85
+    typeConstructor = LazyJavaClassTypeConstructor@87['FilterOutputStream']
 }
 
 LazyJavaClassifierType@247['Flushable'] {
@@ -504,98 +497,98 @@ LazyJavaClassifierType@283['Object'] {
 LazyJavaClassifierType@160['OutputStream'] {
     arguments = ArrayList@285[empty]
     classifier = JavaClassImpl@286['OutputStream']
-    memberScope = LazyJavaClassMemberScope@94
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    memberScope = LazyJavaClassMemberScope@93
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@287['OutputStream'] {
     arguments = ArrayList@288[empty]
     classifier = JavaClassImpl@289['OutputStream']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@290['OutputStream'] {
     arguments = ArrayList@291[empty]
     classifier = JavaClassImpl@292['OutputStream']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@293['OutputStream'] {
     arguments = ArrayList@294[empty]
     classifier = JavaClassImpl@295['OutputStream']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@296['OutputStream'] {
     arguments = ArrayList@297[empty]
     classifier = JavaClassImpl@298['OutputStream']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@299['OutputStream'] {
     arguments = ArrayList@300[empty]
     classifier = JavaClassImpl@301['OutputStream']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@302['OutputStream'] {
     arguments = ArrayList@303[empty]
     classifier = JavaClassImpl@304['OutputStream']
     nullable = 'false': Boolean@185
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@305['OutputStream'] {
     arguments = ArrayList@306[empty]
-    classifier = JavaClassImpl@289['OutputStream']
+    classifier = JavaClassImpl@295['OutputStream']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@307['OutputStream'] {
     arguments = ArrayList@308[empty]
-    classifier = JavaClassImpl@298['OutputStream']
+    classifier = JavaClassImpl@304['OutputStream']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@309['OutputStream'] {
     arguments = ArrayList@310[empty]
-    classifier = JavaClassImpl@292['OutputStream']
+    classifier = JavaClassImpl@298['OutputStream']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@311['OutputStream'] {
     arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@304['OutputStream']
+    classifier = JavaClassImpl@301['OutputStream']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@313['OutputStream'] {
     arguments = ArrayList@314[empty]
-    classifier = JavaClassImpl@295['OutputStream']
+    classifier = JavaClassImpl@289['OutputStream']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@315['OutputStream'] {
     arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@301['OutputStream']
+    classifier = JavaClassImpl@292['OutputStream']
     nullable = 'true': Boolean@191
-    typeConstructor = LazyJavaClassTypeConstructor@96['OutputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@95['OutputStream']
 }
 
 LazyJavaClassifierType@317['PrintStream'] {
     arguments = ArrayList@318[empty]
     classifier = JavaClassImpl@319['PrintStream']
-    memberScope = LazyJavaClassMemberScope@102
+    memberScope = LazyJavaClassMemberScope@101
     nullable = 'false': Boolean@185
     typeConstructor = LazyJavaClassTypeConstructor@112['PrintStream']
 }
@@ -677,42 +670,42 @@ LazyJavaClassifierType@352['String'] {
 
 LazyJavaClassifierType@355['String'] {
     arguments = ArrayList@356[empty]
-    classifier = JavaClassImpl@338['String']
+    classifier = JavaClassImpl@345['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
 
 LazyJavaClassifierType@357['String'] {
     arguments = ArrayList@358[empty]
-    classifier = JavaClassImpl@351['String']
+    classifier = JavaClassImpl@342['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
 
 LazyJavaClassifierType@359['String'] {
     arguments = ArrayList@360[empty]
-    classifier = JavaClassImpl@342['String']
+    classifier = JavaClassImpl@354['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
 
 LazyJavaClassifierType@361['String'] {
     arguments = ArrayList@362[empty]
-    classifier = JavaClassImpl@354['String']
+    classifier = JavaClassImpl@348['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
 
 LazyJavaClassifierType@363['String'] {
     arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@345['String']
+    classifier = JavaClassImpl@351['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
 
 LazyJavaClassifierType@365['String'] {
     arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@348['String']
+    classifier = JavaClassImpl@338['String']
     nullable = 'true': Boolean@191
     typeConstructor = DeserializedClassTypeConstructor@339
 }
@@ -742,77 +735,77 @@ LazyJavaClassifierType@378['T'] {
     arguments = ArrayList@379[empty]
     classifier = JavaTypeParameterImpl@380['T']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
 }
 
-LazyJavaClassifierType@382['T'] {
-    arguments = ArrayList@383[empty]
-    classifier = JavaTypeParameterImpl@384['T']
+LazyJavaClassifierType@381['T'] {
+    arguments = ArrayList@382[empty]
+    classifier = JavaTypeParameterImpl@383['T']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
 }
 
 LazyJavaClassifierType@385['T'] {
     arguments = ArrayList@386[empty]
     classifier = JavaTypeParameterImpl@387['T']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
 }
 
 LazyJavaClassifierType@388['T'] {
     arguments = ArrayList@389[empty]
     classifier = JavaTypeParameterImpl@390['T']
     nullable = 'false': Boolean@185
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
 }
 
 LazyJavaClassifierType@391['T'] {
     arguments = ArrayList@392[empty]
+    classifier = JavaTypeParameterImpl@390['T']
+    nullable = 'true': Boolean@191
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
+}
+
+LazyJavaClassifierType@393['T'] {
+    arguments = ArrayList@394[empty]
     classifier = JavaTypeParameterImpl@373['T']
     nullable = 'true': Boolean@191
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
 }
 
-LazyJavaClassifierType@393['T'] {
-    arguments = ArrayList@394[empty]
-    classifier = JavaTypeParameterImpl@369['T']
-    nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
-}
-
 LazyJavaClassifierType@395['T'] {
     arguments = ArrayList@396[empty]
-    classifier = JavaTypeParameterImpl@377['T']
+    classifier = JavaTypeParameterImpl@383['T']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
 }
 
 LazyJavaClassifierType@397['T'] {
     arguments = ArrayList@398[empty]
-    classifier = JavaTypeParameterImpl@390['T']
+    classifier = JavaTypeParameterImpl@369['T']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
 }
 
 LazyJavaClassifierType@399['T'] {
     arguments = ArrayList@400[empty]
     classifier = JavaTypeParameterImpl@380['T']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
 }
 
 LazyJavaClassifierType@401['T'] {
     arguments = ArrayList@402[empty]
     classifier = JavaTypeParameterImpl@387['T']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
 }
 
 LazyJavaClassifierType@403['T'] {
     arguments = ArrayList@404[empty]
-    classifier = JavaTypeParameterImpl@384['T']
+    classifier = JavaTypeParameterImpl@377['T']
     nullable = 'true': Boolean@191
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
 }
 
 LazyJavaClassifierType@156['Throwable'] {
@@ -888,20 +881,20 @@ LazyJavaPackageFragmentProvider@409 {
     topLevelClasses(JavaClassImpl@174['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
     topLevelClasses(JavaClassImpl@177['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
     topLevelClasses(JavaClassImpl@179['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@478['ArrayList']) = LazyJavaClassDescriptor@11['ArrayList']
-    topLevelClasses(JavaClassImpl@181['AutoCloseable']) = LazyJavaClassDescriptor@19['AutoCloseable']
-    topLevelClasses(JavaClassImpl@188['Charset']) = LazyJavaClassDescriptor@23['Charset']
-    topLevelClasses(JavaClassImpl@479['Class']) = LazyJavaClassDescriptor@25['Class']
-    topLevelClasses(JavaClassImpl@200['Closeable']) = LazyJavaClassDescriptor@26['Closeable']
-    topLevelClasses(JavaClassImpl@480['Collections']) = LazyJavaClassDescriptor@30['Collections']
-    topLevelClasses(JavaClassImpl@481['Comparable']) = LazyJavaClassDescriptor@45['Comparable']
-    topLevelClasses(JavaClassImpl@482['Exception']) = LazyJavaClassDescriptor@74['Exception']
-    topLevelClasses(JavaClassImpl@483['File']) = LazyJavaClassDescriptor@83['File']
-    topLevelClasses(JavaClassImpl@246['FilterOutputStream']) = LazyJavaClassDescriptor@85['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@484['List']) = LazyJavaClassDescriptor@89['List']
-    topLevelClasses(JavaClassImpl@485['Object']) = LazyJavaClassDescriptor@91['Object']
-    topLevelClasses(JavaClassImpl@286['OutputStream']) = LazyJavaClassDescriptor@93['OutputStream']
-    topLevelClasses(JavaClassImpl@486['PrintStream']) = LazyJavaClassDescriptor@97['PrintStream']
+    topLevelClasses(JavaClassImpl@478['ArrayList']) = LazyJavaClassDescriptor@10['ArrayList']
+    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@480['Collections']) = LazyJavaClassDescriptor@29['Collections']
+    topLevelClasses(JavaClassImpl@481['Comparable']) = LazyJavaClassDescriptor@44['Comparable']
+    topLevelClasses(JavaClassImpl@482['Exception']) = LazyJavaClassDescriptor@73['Exception']
+    topLevelClasses(JavaClassImpl@483['File']) = LazyJavaClassDescriptor@82['File']
+    topLevelClasses(JavaClassImpl@246['FilterOutputStream']) = LazyJavaClassDescriptor@84['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@484['List']) = LazyJavaClassDescriptor@88['List']
+    topLevelClasses(JavaClassImpl@485['Object']) = LazyJavaClassDescriptor@90['Object']
+    topLevelClasses(JavaClassImpl@286['OutputStream']) = LazyJavaClassDescriptor@92['OutputStream']
+    topLevelClasses(JavaClassImpl@486['PrintStream']) = LazyJavaClassDescriptor@96['PrintStream']
     topLevelClasses(JavaClassImpl@322['RandomAccess']) = LazyJavaClassDescriptor@113['RandomAccess']
     topLevelClasses(JavaClassImpl@324['Serializable']) = LazyJavaClassDescriptor@115['Serializable']
     topLevelClasses(JavaClassImpl@487['Set']) = LazyJavaClassDescriptor@488['Set']
@@ -920,9 +913,7 @@ LazyJavaPackageFragment@411['<root>'] {
     classes('PrintStream': Name@499) = null // through LazyPackageFragmentScopeForJavaPackage@491
     classes('Set': Name@500) = null // through LazyPackageFragmentScopeForJavaPackage@491
     classes('System': Name@501) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('getMessage': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@491
     classes('java': Name@502) = null // through LazyPackageFragmentScopeForJavaPackage@491
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@491
     classes('util': Name@503) = null // through LazyPackageFragmentScopeForJavaPackage@491
     classes('utils': Name@504) = null // through LazyPackageFragmentScopeForJavaPackage@491
     classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@491
@@ -930,16 +921,14 @@ LazyJavaPackageFragment@411['<root>'] {
     functions('ArrayList': Name@490) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
     functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
     functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
-    functions('getMessage': Name@77) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
     functions('java': Name@508) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
     functions('utils': Name@509) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@491
     memberIndex = computeMemberIndex$1@510 // through LazyPackageFragmentScopeForJavaPackage@491
 }
 
 LazyJavaPackageFragment@432['io'] {
-    classes('File': Name@511) = LazyJavaClassDescriptor@83['File'] // through LazyPackageFragmentScopeForJavaPackage@512
-    classes('PrintStream': Name@513) = LazyJavaClassDescriptor@97['PrintStream'] // through LazyPackageFragmentScopeForJavaPackage@512
+    classes('File': Name@511) = LazyJavaClassDescriptor@82['File'] // through LazyPackageFragmentScopeForJavaPackage@512
+    classes('PrintStream': Name@513) = LazyJavaClassDescriptor@96['PrintStream'] // through LazyPackageFragmentScopeForJavaPackage@512
     deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@512
     functions('PrintStream': Name@514) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@512
     memberIndex = computeMemberIndex$1@515 // through LazyPackageFragmentScopeForJavaPackage@512
@@ -955,11 +944,9 @@ LazyJavaPackageFragment@421['java'] {
     classes('PrintStream': Name@507) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('Set': Name@500) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('System': Name@501) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('getMessage': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('io': Name@518) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('java': Name@519) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('lang': Name@520) = null // through LazyPackageFragmentScopeForJavaPackage@516
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('util': Name@521) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('utils': Name@522) = null // through LazyPackageFragmentScopeForJavaPackage@516
     classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@516
@@ -967,26 +954,22 @@ LazyJavaPackageFragment@421['java'] {
     functions('ArrayList': Name@490) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
     functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
     functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('getMessage': Name@77) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
     functions('io': Name@523) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
     functions('lang': Name@524) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
     functions('util': Name@525) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@516
     memberIndex = computeMemberIndex$1@526 // through LazyPackageFragmentScopeForJavaPackage@516
 }
 
 LazyJavaPackageFragment@436['lang'] {
     classes('ArrayList': Name@490) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Class': Name@528) = LazyJavaClassDescriptor@25['Class'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Comparable': Name@529) = LazyJavaClassDescriptor@45['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Exception': Name@494) = LazyJavaClassDescriptor@74['Exception'] // through LazyPackageFragmentScopeForJavaPackage@527
+    classes('Class': Name@528) = LazyJavaClassDescriptor@24['Class'] // through LazyPackageFragmentScopeForJavaPackage@527
+    classes('Comparable': Name@529) = LazyJavaClassDescriptor@44['Comparable'] // through LazyPackageFragmentScopeForJavaPackage@527
+    classes('Exception': Name@494) = LazyJavaClassDescriptor@73['Exception'] // through LazyPackageFragmentScopeForJavaPackage@527
     classes('List': Name@496) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('Object': Name@530) = LazyJavaClassDescriptor@91['Object'] // through LazyPackageFragmentScopeForJavaPackage@527
+    classes('Object': Name@530) = LazyJavaClassDescriptor@90['Object'] // through LazyPackageFragmentScopeForJavaPackage@527
     classes('PrintStream': Name@507) = null // through LazyPackageFragmentScopeForJavaPackage@527
     classes('System': Name@501) = LazyJavaClassDescriptor@117['System'] // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('getMessage': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@527
     classes('java': Name@519) = null // through LazyPackageFragmentScopeForJavaPackage@527
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@527
     classes('util': Name@503) = null // through LazyPackageFragmentScopeForJavaPackage@527
     classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@527
     deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@527
@@ -995,39 +978,33 @@ LazyJavaPackageFragment@436['lang'] {
     functions('Comparable': Name@532) = ArrayList@533[1] { SamConstructorDescriptor@534['Comparable'] } // through LazyPackageFragmentScopeForJavaPackage@527
     functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
     functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
-    functions('getMessage': Name@77) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@527
     memberIndex = computeMemberIndex$1@535 // through LazyPackageFragmentScopeForJavaPackage@527
 }
 
 LazyJavaPackageFragment@450['util'] {
-    classes('ArrayList': Name@490) = LazyJavaClassDescriptor@11['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('Collections': Name@492) = LazyJavaClassDescriptor@30['Collections'] // through LazyPackageFragmentScopeForJavaPackage@536
+    classes('ArrayList': Name@490) = LazyJavaClassDescriptor@10['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@536
+    classes('Collections': Name@492) = LazyJavaClassDescriptor@29['Collections'] // through LazyPackageFragmentScopeForJavaPackage@536
     classes('Exception': Name@494) = null // through LazyPackageFragmentScopeForJavaPackage@536
     classes('Int': Name@495) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('List': Name@537) = LazyJavaClassDescriptor@89['List'] // through LazyPackageFragmentScopeForJavaPackage@536
+    classes('List': Name@537) = LazyJavaClassDescriptor@88['List'] // through LazyPackageFragmentScopeForJavaPackage@536
     classes('MutableList': Name@497) = null // through LazyPackageFragmentScopeForJavaPackage@536
     classes('Object': Name@498) = null // through LazyPackageFragmentScopeForJavaPackage@536
     classes('PrintStream': Name@507) = null // through LazyPackageFragmentScopeForJavaPackage@536
     classes('Set': Name@500) = LazyJavaClassDescriptor@488['Set'] // through LazyPackageFragmentScopeForJavaPackage@536
     classes('System': Name@501) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('getMessage': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@536
     classes('java': Name@519) = null // through LazyPackageFragmentScopeForJavaPackage@536
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@536
     classes('util': Name@503) = null // through LazyPackageFragmentScopeForJavaPackage@536
     classes('xxx': Name@505) = null // through LazyPackageFragmentScopeForJavaPackage@536
     deserializedPackageScope = Empty@506 // through LazyPackageFragmentScopeForJavaPackage@536
     functions('ArrayList': Name@490) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
     functions('List': Name@496) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
     functions('PrintStream': Name@507) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
-    functions('getMessage': Name@77) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@536
     memberIndex = computeMemberIndex$1@538 // through LazyPackageFragmentScopeForJavaPackage@536
 }
 
 LazyJavaTypeParameterDescriptor@139['E'] {
     defaultType = JetTypeImpl@539['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
     upperBounds = LinkedHashSet@540[1] { NullableType@541 }
 }
 
@@ -1037,55 +1014,344 @@ LazyJavaTypeParameterDescriptor@162['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@131['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@216
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@223
 }
 
 LazyJavaTypeParameterDescriptor@152['T'] {
     defaultType = JetTypeImpl@545['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@384
     upperBounds = LinkedHashSet@546[1] { NullableType@547 }
 }
 
 LazyJavaTypeParameterDescriptor@548['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
     upperBounds = LinkedHashSet@549[1] { NullableType@550 }
     upperBoundsAsType = NullableType@550
 }
 
 LazyJavaTypeParameterDescriptor@551['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@370
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@374
     upperBounds = LinkedHashSet@552[1] { NullableType@553 }
     upperBoundsAsType = NullableType@553
 }
 
 LazyJavaTypeParameterResolver@554 {
-    resolve(JavaTypeParameterImpl@555['E']) = LazyJavaTypeParameterDescriptor@162['E']
+    resolve(JavaTypeParameterImpl@555['E']) = LazyJavaTypeParameterDescriptor@131['E']
 }
 
 LazyJavaTypeParameterResolver@556 {
-    resolve(JavaTypeParameterImpl@557['E']) = LazyJavaTypeParameterDescriptor@131['E']
+    resolve(JavaTypeParameterImpl@557['E']) = LazyJavaTypeParameterDescriptor@139['E']
 }
 
 LazyJavaTypeParameterResolver@558 {
-    resolve(JavaTypeParameterImpl@559['E']) = LazyJavaTypeParameterDescriptor@139['E']
+    resolve(JavaTypeParameterImpl@559['E']) = LazyJavaTypeParameterDescriptor@162['E']
 }
 
 LazyJavaTypeParameterResolver@560 {
-    resolve(JavaTypeParameterImpl@561['T']) = LazyJavaTypeParameterDescriptor@551['T']
+    resolve(JavaTypeParameterImpl@383['T']) = LazyJavaTypeParameterDescriptor@152['T']
 }
 
-LazyJavaTypeParameterResolver@562 {
-    resolve(JavaTypeParameterImpl@563['T']) = LazyJavaTypeParameterDescriptor@548['T']
+LazyJavaTypeParameterResolver@561 {
+    resolve(JavaTypeParameterImpl@562['T']) = LazyJavaTypeParameterDescriptor@548['T']
 }
 
-LazyJavaTypeParameterResolver@564 {
-    resolve(JavaTypeParameterImpl@380['T']) = LazyJavaTypeParameterDescriptor@152['T']
+LazyJavaTypeParameterResolver@563 {
+    resolve(JavaTypeParameterImpl@564['T']) = LazyJavaTypeParameterDescriptor@551['T']
 }
 
 LazyJavaTypeParameterResolver@565 {
-    resolve(JavaTypeParameterImpl@380['T']) = null
+    resolve(JavaTypeParameterImpl@390['T']) = null
 }
 
 LazyJavaTypeParameterResolver@566 {
-    resolve(JavaTypeParameterImpl@390['T']) = null
+    resolve(JavaTypeParameterImpl@383['T']) = null
+}
+
+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]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@586 {
+    <name not found> = ArrayList@587[1] { ResolutionCandidate@588 }
+    <name not found> = ArrayList@589[1] { ResolutionCandidate@588 }
+    <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@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@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@602 {
+    <name not found> = ArrayList@603[1] { ResolutionCandidate@604 }
+    <name not found> = ArrayList@605[1] { ResolutionCandidate@604 }
+    <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 }
+    <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 }
+}
+
+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[3] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626 }
+    <name not found> = ArrayList@627[3] { ResolutionCandidate@624, ResolutionCandidate@625, ResolutionCandidate@626 }
+    <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 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@630 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@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 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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 f865631b2a4..36aa81a683c 100644
--- a/compiler/testData/diagnostics/tests/Return.lazy.log
+++ b/compiler/testData/diagnostics/tests/Return.lazy.log
@@ -8,23 +8,34 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@10) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('compareTo': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('compareTo': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@12
-}
-
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('lang': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
+    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
+    functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
+    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('compareTo': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('compareTo': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@20
+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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
index 6812f2d0db5..76c66bf46d9 100644
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiver.lazy.log
@@ -16,22 +16,21 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('plus': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('plus': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
index 05486f3facc..6d6f0441779 100644
--- a/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/SafeCallNonNullReceiverReturnNull.lazy.log
@@ -36,3 +36,17 @@ LazyJavaPackageFragment@10['lang'] {
     functions('gg': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
index 9579cccd074..78a9212a408 100644
--- a/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/SafeCallOnFakePackage.lazy.log
@@ -7,46 +7,40 @@ DescriptorResolver@0 {
 LazyJavaClassDescriptor@4['Appendable'] {
     functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
-LazyJavaClassDescriptor@11['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
+LazyJavaClassDescriptor@10['AutoCloseable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@15['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
+LazyJavaClassDescriptor@14['Closeable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
 }
 
-LazyJavaClassDescriptor@19['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['FilterOutputStream']
+LazyJavaClassDescriptor@18['FilterOutputStream'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@23['OutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@24
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@26['OutputStream']
+LazyJavaClassDescriptor@22['OutputStream'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
+    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
 }
 
-LazyJavaClassDescriptor@27['PrintStream'] {
-    defaultType = JetTypeImpl@28['PrintStream']
-    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@30
-    functions('println': Name@9) = ArrayList@31[10] { JavaMethodDescriptor@32['println'], JavaMethodDescriptor@33['println'], JavaMethodDescriptor@34['println'], ... } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@30
-    nestedClasses('println': Name@9) = null // through LazyJavaClassMemberScope@30
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@30
+LazyJavaClassDescriptor@26['PrintStream'] {
+    defaultType = JetTypeImpl@27['PrintStream']
+    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@29
+    functions('println': Name@30) = ArrayList@31[10] { JavaMethodDescriptor@32['println'], JavaMethodDescriptor@33['println'], JavaMethodDescriptor@34['println'], ... } // through LazyJavaClassMemberScope@29
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
+    nestedClasses('println': Name@30) = null // through LazyJavaClassMemberScope@29
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
 }
@@ -74,27 +68,27 @@ LazyJavaClassDescriptor@50['Test'] {
     typeConstructor = LazyJavaClassTypeConstructor@61['Test']
 }
 
-LazyJavaClassTypeConstructor@10['Appendable'] {
+LazyJavaClassTypeConstructor@9['Appendable'] {
     parameters = ArrayList@62[empty]
     supertypes = ArrayList@63[1] { JetTypeImpl@64['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['AutoCloseable'] {
+LazyJavaClassTypeConstructor@13['AutoCloseable'] {
     parameters = ArrayList@65[empty]
     supertypes = ArrayList@66[1] { JetTypeImpl@64['Any'] }
 }
 
-LazyJavaClassTypeConstructor@18['Closeable'] {
+LazyJavaClassTypeConstructor@17['Closeable'] {
     parameters = ArrayList@67[empty]
     supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@22['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@21['FilterOutputStream'] {
     parameters = ArrayList@70[empty]
     supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@26['OutputStream'] {
+LazyJavaClassTypeConstructor@25['OutputStream'] {
     parameters = ArrayList@73[empty]
     supertypes = ArrayList@74[1] { LazyJavaClassifierType@75['Closeable'] }
 }
@@ -116,35 +110,35 @@ LazyJavaClassifierType@79['Appendable'] {
     arguments = ArrayList@83[empty]
     classifier = JavaClassImpl@84['Appendable']
     memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
 LazyJavaClassifierType@69['AutoCloseable'] {
     arguments = ArrayList@85[empty]
     classifier = JavaClassImpl@86['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
-}
-
-LazyJavaClassifierType@80['Closeable'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['Closeable']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
 LazyJavaClassifierType@75['Closeable'] {
+    arguments = ArrayList@87[empty]
+    classifier = JavaClassImpl@88['Closeable']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
+}
+
+LazyJavaClassifierType@80['Closeable'] {
     arguments = ArrayList@89[empty]
     classifier = JavaClassImpl@90['Closeable']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
 }
 
 LazyJavaClassifierType@78['FilterOutputStream'] {
     arguments = ArrayList@91[empty]
     classifier = JavaClassImpl@92['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
 }
 
 LazyJavaClassifierType@93['Flushable'] {
@@ -194,14 +188,14 @@ LazyJavaClassifierType@111['Object'] {
 LazyJavaClassifierType@72['OutputStream'] {
     arguments = ArrayList@113[empty]
     classifier = JavaClassImpl@114['OutputStream']
-    memberScope = LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@26['OutputStream']
+    memberScope = LazyJavaClassMemberScope@23
+    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
 }
 
 LazyJavaClassifierType@115['PrintStream'] {
     arguments = ArrayList@116[empty]
     classifier = JavaClassImpl@117['PrintStream']
-    memberScope = LazyJavaClassMemberScope@30
+    memberScope = LazyJavaClassMemberScope@29
     nullable = 'false': Boolean@98
     typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
 }
@@ -255,11 +249,11 @@ LazyJavaPackageFragmentProvider@130 {
     packageFragments('kotlin.io': FqName@152) = null
     packageFragments('kotlin.jvm': FqName@153) = null
     topLevelClasses(JavaClassImpl@84['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@86['AutoCloseable']) = LazyJavaClassDescriptor@11['AutoCloseable']
-    topLevelClasses(JavaClassImpl@88['Closeable']) = LazyJavaClassDescriptor@15['Closeable']
-    topLevelClasses(JavaClassImpl@92['FilterOutputStream']) = LazyJavaClassDescriptor@19['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@114['OutputStream']) = LazyJavaClassDescriptor@23['OutputStream']
-    topLevelClasses(JavaClassImpl@117['PrintStream']) = LazyJavaClassDescriptor@27['PrintStream']
+    topLevelClasses(JavaClassImpl@86['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
+    topLevelClasses(JavaClassImpl@90['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']
     topLevelClasses(JavaClassImpl@154['System']) = LazyJavaClassDescriptor@39['System']
     topLevelClasses(JavaClassImpl@155['Test']) = LazyJavaClassDescriptor@50['Test']
 }
@@ -268,32 +262,102 @@ LazyJavaPackageFragment@132['<root>'] {
     classes('System': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
     classes('Test': Name@158) = LazyJavaClassDescriptor@50['Test'] // through LazyPackageFragmentScopeForJavaPackage@157
     classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('plus': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@157
-    deserializedPackageScope = Empty@161 // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('plus': Name@160) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@157
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@157
+    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@157
 }
 
 LazyJavaPackageFragment@140['java'] {
-    classes('lang': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    deserializedPackageScope = Empty@161 // through LazyPackageFragmentScopeForJavaPackage@164
-    functions('lang': Name@165) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@164
-    memberIndex = computeMemberIndex$1@166 // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('lang': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@162
+    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@162
+    functions('lang': Name@163) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@162
+    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@162
 }
 
 LazyJavaPackageFragment@144['lang'] {
-    classes('System': Name@156) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@167
-    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    classes('plus': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@167
-    deserializedPackageScope = Empty@161 // through LazyPackageFragmentScopeForJavaPackage@167
-    functions('plus': Name@160) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@167
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@167
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@167
+    classes('System': Name@156) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@165
+    classes('foo': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@165
+    deserializedPackageScope = Empty@160 // through LazyPackageFragmentScopeForJavaPackage@165
 }
 
-LazyJavaTypeAttributes@169 {
-    howThisTypeIsUsedAccordingToAnnotations$delegate = TypeUsage@170
+LazyJavaTypeAttributes@166 {
+    howThisTypeIsUsedAccordingToAnnotations$delegate = TypeUsage@167
+}
+
+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]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@6[empty]
+    <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@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> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@199 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@200 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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 b3636c4e86f..5ca092844ed 100644
--- a/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
+++ b/compiler/testData/diagnostics/tests/StarsInFunctionCalls.lazy.log
@@ -51,3 +51,80 @@ LazyJavaPackageFragment@8['lang'] {
     functions('ggetT': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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]
+    <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]
+    <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]
+    <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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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/StringTemplates.lazy.log b/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
index e14a8e5965e..1483e57a914 100644
--- a/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
+++ b/compiler/testData/diagnostics/tests/StringTemplates.lazy.log
@@ -29,32 +29,159 @@ LazyJavaPackageFragment@8['<root>'] {
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('buzz': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('map': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('xxx': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('buzz': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('map': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('xxx': Name@34) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('xxx': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('buzz': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('map': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('xxx': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('lang': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('buzz': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('map': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('xxx': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('buzz': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('map': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('xxx': Name@34) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('buzz': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('map': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('xxx': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('buzz': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('map': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('xxx': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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@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 }
+}
+
+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 }
+}
+
+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> = 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[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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 d835dc6b34e..04962d92176 100644
--- a/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
+++ b/compiler/testData/diagnostics/tests/SupertypeListChecks.lazy.log
@@ -42,3 +42,8 @@ LazyJavaPackageFragment@23['java'] {
     functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
 }
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <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 58d8ba19048..2ecff42d658 100644
--- a/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
+++ b/compiler/testData/diagnostics/tests/SyntaxErrorInTestHighlighting.lazy.log
@@ -7,23 +7,14 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@9) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('plus': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('plus': Name@10) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@14 // through LazyPackageFragmentScopeForJavaPackage@11
-}
-
 LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@17) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@16
+    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
+    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
+    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
+    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
 }
 
-LazyJavaPackageFragment@6['lang'] {
-    classes('plus': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('plus': Name@10) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@19
+ResolutionTaskHolder@16 {
+    <name not found> = ArrayList@17[8] { ResolutionCandidate@18, ResolutionCandidate@19, ResolutionCandidate@20, ... }
+    <name not found> = ArrayList@21[8] { ResolutionCandidate@18, ResolutionCandidate@19, ResolutionCandidate@20, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/TypeInference.lazy.log b/compiler/testData/diagnostics/tests/TypeInference.lazy.log
index 4558456a54b..6c930491895 100644
--- a/compiler/testData/diagnostics/tests/TypeInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/TypeInference.lazy.log
@@ -49,3 +49,75 @@ LazyJavaPackageFragment@11['lang'] {
     functions('bar': Name@30) = 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@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]
+    <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 }
+    <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 {
+    <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]
+    <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@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]
+    <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 3a6b5ed2311..72e4bc64090 100644
--- a/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
+++ b/compiler/testData/diagnostics/tests/TypeMismatchOnOverrideWithSyntaxErrors.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <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 8d92efaf5df..28e6fcd1a9d 100644
--- a/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/UnitByDefaultForFunctionTypes.lazy.log
@@ -13,25 +13,33 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Unit': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
     classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('f': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('f': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('f': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('f': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/UnitValue.lazy.log b/compiler/testData/diagnostics/tests/UnitValue.lazy.log
index 58c2e9ee19f..ec49615b9eb 100644
--- a/compiler/testData/diagnostics/tests/UnitValue.lazy.log
+++ b/compiler/testData/diagnostics/tests/UnitValue.lazy.log
@@ -25,3 +25,10 @@ LazyJavaPackageFragment@5['java'] {
 LazyJavaPackageFragment@7['lang'] {
     deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/Unresolved.lazy.log b/compiler/testData/diagnostics/tests/Unresolved.lazy.log
index 232991ca867..9094b44684f 100644
--- a/compiler/testData/diagnostics/tests/Unresolved.lazy.log
+++ b/compiler/testData/diagnostics/tests/Unresolved.lazy.log
@@ -58,16 +58,524 @@ LazyJavaPackageFragment@15['lang'] {
     classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('foo1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('i': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('plus': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('plusAssign': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('plusAssign': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@54
     functions('Pair': Name@53) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('a': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('collection': Name@63) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('a': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('collection': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     functions('foo': Name@57) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     functions('foo1': Name@58) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('i': Name@64) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('plus': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('plusAssign': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('i': Name@63) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('plusAssign': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@54
+}
+
+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]
+    <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 }
+    <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@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@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 }
+}
+
+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> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+}
+
+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]
+}
+
+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 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 e78a3ce37c3..603d38bd662 100644
--- a/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
+++ b/compiler/testData/diagnostics/tests/UnusedVariables.lazy.log
@@ -51,26 +51,456 @@ LazyJavaPackageFragment@14['java'] {
 LazyJavaPackageFragment@16['lang'] {
     classes('IncDec': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
     classes('a': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('compareTo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('dec': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('doSmth': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('equals': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('hasNext': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('inc': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('iterator': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('next': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('rangeTo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('x': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('doSmth': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('equals': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('x': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
     deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
     functions('IncDec': Name@46) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('compareTo': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('dec': Name@50) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('doSmth': Name@51) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('equals': Name@52) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('hasNext': Name@53) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('inc': Name@54) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('iterator': Name@55) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('next': Name@56) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('rangeTo': Name@57) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('doSmth': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('equals': Name@50) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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> = 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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@44[empty]
+    <name not found> = EmptyList@44[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@44[empty]
+}
+
+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@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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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[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[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[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[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[2] { ResolutionCandidate@326, ResolutionCandidate@327 }
+    <name not found> = ArrayList@328[2] { ResolutionCandidate@326, ResolutionCandidate@327 }
+    <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 e99e4648398..ce878f07266 100644
--- a/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
+++ b/compiler/testData/diagnostics/tests/ValAndFunOverrideCompatibilityClash.lazy.log
@@ -381,7 +381,7 @@ LazyJavaClassifierType@374['Collection<? extends E>'] {
 
 LazyJavaClassifierType@379['Collection<? extends E>'] {
     arguments = ArrayList@380[1] { TypeProjectionImpl@381 }
-    classifier = JavaClassImpl@377['Collection']
+    classifier = JavaClassImpl@356['Collection']
     memberScope = SubstitutingScope@382
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -389,7 +389,7 @@ LazyJavaClassifierType@379['Collection<? extends E>'] {
 
 LazyJavaClassifierType@385['Collection<? extends E>'] {
     arguments = ArrayList@386[1] { TypeProjectionImpl@387 }
-    classifier = JavaClassImpl@362['Collection']
+    classifier = JavaClassImpl@372['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@372['Collection']
+    classifier = JavaClassImpl@377['Collection']
     memberScope = SubstitutingScope@392
     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@356['Collection']
+    classifier = JavaClassImpl@362['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@419['Collection']
+    classifier = JavaClassImpl@429['Collection']
     memberScope = SubstitutingScope@434
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -477,7 +477,7 @@ LazyJavaClassifierType@431['Collection<?>'] {
 
 LazyJavaClassifierType@435['Collection<?>'] {
     arguments = ArrayList@436[1] { LazyStarProjection@437 }
-    classifier = JavaClassImpl@414['Collection']
+    classifier = JavaClassImpl@424['Collection']
     memberScope = SubstitutingScope@438
     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@424['Collection']
+    classifier = JavaClassImpl@419['Collection']
     memberScope = SubstitutingScope@442
     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@429['Collection']
+    classifier = JavaClassImpl@414['Collection']
     memberScope = SubstitutingScope@454
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@384
@@ -535,105 +535,105 @@ LazyJavaClassifierType@464['E'] {
     arguments = ArrayList@465[empty]
     classifier = JavaTypeParameterImpl@466['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
-LazyJavaClassifierType@468['E'] {
-    arguments = ArrayList@469[empty]
-    classifier = JavaTypeParameterImpl@470['E']
+LazyJavaClassifierType@467['E'] {
+    arguments = ArrayList@468[empty]
+    classifier = JavaTypeParameterImpl@469['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@471['E'] {
     arguments = ArrayList@472[empty]
     classifier = JavaTypeParameterImpl@473['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
-LazyJavaClassifierType@474['E'] {
-    arguments = ArrayList@475[empty]
-    classifier = JavaTypeParameterImpl@476['E']
+LazyJavaClassifierType@475['E'] {
+    arguments = ArrayList@476[empty]
+    classifier = JavaTypeParameterImpl@477['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
-LazyJavaClassifierType@477['E'] {
-    arguments = ArrayList@478[empty]
-    classifier = JavaTypeParameterImpl@479['E']
+LazyJavaClassifierType@478['E'] {
+    arguments = ArrayList@479[empty]
+    classifier = JavaTypeParameterImpl@480['E']
     nullable = 'false': Boolean@343
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
-LazyJavaClassifierType@480['E'] {
-    arguments = ArrayList@481[empty]
-    classifier = JavaTypeParameterImpl@482['E']
-    nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
-}
-
-LazyJavaClassifierType@483['E'] {
-    arguments = ArrayList@484[empty]
-    classifier = JavaTypeParameterImpl@485['E']
+LazyJavaClassifierType@481['E'] {
+    arguments = ArrayList@482[empty]
+    classifier = JavaTypeParameterImpl@483['E']
     nullable = 'false': Boolean@343
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
-LazyJavaClassifierType@486['E'] {
-    arguments = ArrayList@487[empty]
-    classifier = JavaTypeParameterImpl@488['E']
+LazyJavaClassifierType@484['E'] {
+    arguments = ArrayList@485[empty]
+    classifier = JavaTypeParameterImpl@486['E']
+    nullable = 'false': Boolean@343
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+}
+
+LazyJavaClassifierType@487['E'] {
+    arguments = ArrayList@488[empty]
+    classifier = JavaTypeParameterImpl@489['E']
     nullable = 'false': Boolean@343
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
-LazyJavaClassifierType@489['E'] {
-    arguments = ArrayList@490[empty]
-    classifier = JavaTypeParameterImpl@491['E']
+LazyJavaClassifierType@490['E'] {
+    arguments = ArrayList@491[empty]
+    classifier = JavaTypeParameterImpl@492['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
-LazyJavaClassifierType@492['E'] {
-    arguments = ArrayList@493[empty]
-    classifier = JavaTypeParameterImpl@494['E']
+LazyJavaClassifierType@493['E'] {
+    arguments = ArrayList@494[empty]
+    classifier = JavaTypeParameterImpl@495['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@496['E'] {
     arguments = ArrayList@497[empty]
     classifier = JavaTypeParameterImpl@498['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@499['E'] {
     arguments = ArrayList@500[empty]
     classifier = JavaTypeParameterImpl@501['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@502['E'] {
     arguments = ArrayList@503[empty]
     classifier = JavaTypeParameterImpl@504['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@505['E'] {
     arguments = ArrayList@506[empty]
     classifier = JavaTypeParameterImpl@507['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@508['E'] {
     arguments = ArrayList@509[empty]
     classifier = JavaTypeParameterImpl@510['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@511['E'] {
@@ -654,49 +654,49 @@ LazyJavaClassifierType@517['E'] {
     arguments = ArrayList@518[empty]
     classifier = JavaTypeParameterImpl@519['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@520['E'] {
     arguments = ArrayList@521[empty]
     classifier = JavaTypeParameterImpl@522['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@523['E'] {
     arguments = ArrayList@524[empty]
     classifier = JavaTypeParameterImpl@525['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@526['E'] {
     arguments = ArrayList@527[empty]
     classifier = JavaTypeParameterImpl@528['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@529['E'] {
     arguments = ArrayList@530[empty]
     classifier = JavaTypeParameterImpl@531['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@532['E'] {
     arguments = ArrayList@533[empty]
     classifier = JavaTypeParameterImpl@534['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@535['E'] {
     arguments = ArrayList@536[empty]
     classifier = JavaTypeParameterImpl@537['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@538['E'] {
@@ -710,133 +710,133 @@ LazyJavaClassifierType@541['E'] {
     arguments = ArrayList@542[empty]
     classifier = JavaTypeParameterImpl@543['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@544['E'] {
     arguments = ArrayList@545[empty]
     classifier = JavaTypeParameterImpl@546['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@547['E'] {
     arguments = ArrayList@548[empty]
     classifier = JavaTypeParameterImpl@549['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@550['E'] {
     arguments = ArrayList@551[empty]
     classifier = JavaTypeParameterImpl@552['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@553['E'] {
     arguments = ArrayList@554[empty]
     classifier = JavaTypeParameterImpl@555['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@556['E'] {
     arguments = ArrayList@557[empty]
     classifier = JavaTypeParameterImpl@558['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@559['E'] {
     arguments = ArrayList@560[empty]
     classifier = JavaTypeParameterImpl@561['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@562['E'] {
     arguments = ArrayList@563[empty]
     classifier = JavaTypeParameterImpl@564['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@565['E'] {
     arguments = ArrayList@566[empty]
     classifier = JavaTypeParameterImpl@567['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@568['E'] {
     arguments = ArrayList@569[empty]
     classifier = JavaTypeParameterImpl@570['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@571['E'] {
     arguments = ArrayList@572[empty]
     classifier = JavaTypeParameterImpl@573['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@574['E'] {
     arguments = ArrayList@575[empty]
     classifier = JavaTypeParameterImpl@576['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@577['E'] {
     arguments = ArrayList@578[empty]
     classifier = JavaTypeParameterImpl@579['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@580['E'] {
     arguments = ArrayList@581[empty]
     classifier = JavaTypeParameterImpl@582['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@583['E'] {
     arguments = ArrayList@584[empty]
     classifier = JavaTypeParameterImpl@585['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@586['E'] {
     arguments = ArrayList@587[empty]
     classifier = JavaTypeParameterImpl@588['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@589['E'] {
     arguments = ArrayList@590[empty]
     classifier = JavaTypeParameterImpl@591['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@592['E'] {
     arguments = ArrayList@593[empty]
     classifier = JavaTypeParameterImpl@594['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@595['E'] {
     arguments = ArrayList@596[empty]
     classifier = JavaTypeParameterImpl@597['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@598['E'] {
@@ -850,336 +850,336 @@ LazyJavaClassifierType@601['E'] {
     arguments = ArrayList@602[empty]
     classifier = JavaTypeParameterImpl@603['E']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@604['E'] {
     arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@603['E']
+    classifier = JavaTypeParameterImpl@486['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@606['E'] {
     arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@552['E']
+    classifier = JavaTypeParameterImpl@501['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@608['E'] {
     arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@510['E']
+    classifier = JavaTypeParameterImpl@576['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@610['E'] {
     arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@504['E']
+    classifier = JavaTypeParameterImpl@570['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@612['E'] {
     arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@491['E']
+    classifier = JavaTypeParameterImpl@558['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@614['E'] {
     arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@519['E']
+    classifier = JavaTypeParameterImpl@492['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@616['E'] {
     arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@546['E']
+    classifier = JavaTypeParameterImpl@594['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@618['E'] {
     arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@588['E']
+    classifier = JavaTypeParameterImpl@582['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@620['E'] {
     arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@482['E']
+    classifier = JavaTypeParameterImpl@603['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@622['E'] {
     arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@549['E']
+    classifier = JavaTypeParameterImpl@543['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@624['E'] {
     arguments = ArrayList@625[empty]
-    classifier = JavaTypeParameterImpl@600['E']
+    classifier = JavaTypeParameterImpl@525['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@626['E'] {
     arguments = ArrayList@627[empty]
-    classifier = JavaTypeParameterImpl@513['E']
+    classifier = JavaTypeParameterImpl@573['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@628['E'] {
     arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@473['E']
+    classifier = JavaTypeParameterImpl@469['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@630['E'] {
     arguments = ArrayList@631[empty]
-    classifier = JavaTypeParameterImpl@540['E']
+    classifier = JavaTypeParameterImpl@461['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@632['E'] {
     arguments = ArrayList@633[empty]
-    classifier = JavaTypeParameterImpl@466['E']
+    classifier = JavaTypeParameterImpl@504['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@634['E'] {
     arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@561['E']
+    classifier = JavaTypeParameterImpl@546['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@636['E'] {
     arguments = ArrayList@637[empty]
-    classifier = JavaTypeParameterImpl@461['E']
+    classifier = JavaTypeParameterImpl@522['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@638['E'] {
     arguments = ArrayList@639[empty]
-    classifier = JavaTypeParameterImpl@555['E']
+    classifier = JavaTypeParameterImpl@540['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@640['E'] {
     arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@488['E']
+    classifier = JavaTypeParameterImpl@473['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@642['E'] {
     arguments = ArrayList@643[empty]
-    classifier = JavaTypeParameterImpl@564['E']
+    classifier = JavaTypeParameterImpl@477['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@644['E'] {
     arguments = ArrayList@645[empty]
-    classifier = JavaTypeParameterImpl@558['E']
+    classifier = JavaTypeParameterImpl@507['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@646['E'] {
     arguments = ArrayList@647[empty]
-    classifier = JavaTypeParameterImpl@570['E']
+    classifier = JavaTypeParameterImpl@552['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@648['E'] {
     arguments = ArrayList@649[empty]
-    classifier = JavaTypeParameterImpl@585['E']
+    classifier = JavaTypeParameterImpl@466['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@650['E'] {
     arguments = ArrayList@651[empty]
-    classifier = JavaTypeParameterImpl@525['E']
+    classifier = JavaTypeParameterImpl@510['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@652['E'] {
     arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@543['E']
+    classifier = JavaTypeParameterImpl@597['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@654['E'] {
     arguments = ArrayList@655[empty]
-    classifier = JavaTypeParameterImpl@501['E']
+    classifier = JavaTypeParameterImpl@561['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@656['E'] {
     arguments = ArrayList@657[empty]
-    classifier = JavaTypeParameterImpl@594['E']
+    classifier = JavaTypeParameterImpl@528['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@658['E'] {
     arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@597['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
-}
-
-LazyJavaClassifierType@660['E'] {
-    arguments = ArrayList@661[empty]
-    classifier = JavaTypeParameterImpl@479['E']
+    classifier = JavaTypeParameterImpl@579['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
+LazyJavaClassifierType@660['E'] {
+    arguments = ArrayList@661[empty]
+    classifier = JavaTypeParameterImpl@519['E']
+    nullable = 'true': Boolean@383
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+}
+
 LazyJavaClassifierType@662['E'] {
     arguments = ArrayList@663[empty]
-    classifier = JavaTypeParameterImpl@494['E']
+    classifier = JavaTypeParameterImpl@495['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@664['E'] {
     arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@476['E']
+    classifier = JavaTypeParameterImpl@531['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@666['E'] {
     arguments = ArrayList@667[empty]
-    classifier = JavaTypeParameterImpl@591['E']
+    classifier = JavaTypeParameterImpl@600['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@668['E'] {
     arguments = ArrayList@669[empty]
-    classifier = JavaTypeParameterImpl@576['E']
+    classifier = JavaTypeParameterImpl@513['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@670['E'] {
     arguments = ArrayList@671[empty]
     classifier = JavaTypeParameterImpl@537['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@672['E'] {
     arguments = ArrayList@673[empty]
-    classifier = JavaTypeParameterImpl@567['E']
+    classifier = JavaTypeParameterImpl@489['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@674['E'] {
     arguments = ArrayList@675[empty]
-    classifier = JavaTypeParameterImpl@485['E']
+    classifier = JavaTypeParameterImpl@555['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@676['E'] {
     arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@528['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
-}
-
-LazyJavaClassifierType@678['E'] {
-    arguments = ArrayList@679[empty]
-    classifier = JavaTypeParameterImpl@579['E']
-    nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
-}
-
-LazyJavaClassifierType@680['E'] {
-    arguments = ArrayList@681[empty]
-    classifier = JavaTypeParameterImpl@470['E']
+    classifier = JavaTypeParameterImpl@480['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
+LazyJavaClassifierType@678['E'] {
+    arguments = ArrayList@679[empty]
+    classifier = JavaTypeParameterImpl@534['E']
+    nullable = 'true': Boolean@383
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+}
+
+LazyJavaClassifierType@680['E'] {
+    arguments = ArrayList@681[empty]
+    classifier = JavaTypeParameterImpl@498['E']
+    nullable = 'true': Boolean@383
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
+}
+
 LazyJavaClassifierType@682['E'] {
     arguments = ArrayList@683[empty]
-    classifier = JavaTypeParameterImpl@531['E']
+    classifier = JavaTypeParameterImpl@516['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@684['E'] {
     arguments = ArrayList@685[empty]
-    classifier = JavaTypeParameterImpl@534['E']
+    classifier = JavaTypeParameterImpl@585['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@686['E'] {
     arguments = ArrayList@687[empty]
-    classifier = JavaTypeParameterImpl@573['E']
+    classifier = JavaTypeParameterImpl@591['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@688['E'] {
     arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@516['E']
+    classifier = JavaTypeParameterImpl@567['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
 }
 
 LazyJavaClassifierType@690['E'] {
     arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@507['E']
+    classifier = JavaTypeParameterImpl@564['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@692['E'] {
     arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@498['E']
+    classifier = JavaTypeParameterImpl@549['E']
     nullable = 'true': Boolean@383
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@694['E'] {
     arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@582['E']
+    classifier = JavaTypeParameterImpl@483['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
 }
 
 LazyJavaClassifierType@696['E'] {
     arguments = ArrayList@697[empty]
-    classifier = JavaTypeParameterImpl@522['E']
+    classifier = JavaTypeParameterImpl@588['E']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
 }
 
 LazyJavaClassifierType@698['Iterator<E>'] {
@@ -1216,7 +1216,7 @@ LazyJavaClassifierType@714['Iterator<E>'] {
 
 LazyJavaClassifierType@719['Iterator<E>'] {
     arguments = ArrayList@720[1] { TypeProjectionImpl@721 }
-    classifier = JavaClassImpl@712['Iterator']
+    classifier = JavaClassImpl@707['Iterator']
     memberScope = SubstitutingScope@722
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@718
@@ -1224,47 +1224,47 @@ LazyJavaClassifierType@719['Iterator<E>'] {
 
 LazyJavaClassifierType@723['Iterator<E>'] {
     arguments = ArrayList@724[1] { TypeProjectionImpl@725 }
-    classifier = JavaClassImpl@707['Iterator']
+    classifier = JavaClassImpl@712['Iterator']
     memberScope = SubstitutingScope@726
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@718
 }
 
-LazyJavaClassifierType@727['List<E>'] {
-    arguments = ArrayList@728[1] { TypeProjectionImpl@729 }
-    classifier = JavaClassImpl@730['List']
-    memberScope = SubstitutingScope@731
+LazyJavaClassifierType@330['List<E>'] {
+    arguments = ArrayList@727[1] { TypeProjectionImpl@728 }
+    classifier = JavaClassImpl@729['List']
+    memberScope = SubstitutingScope@730
     nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@732
+    typeConstructor = DeserializedClassTypeConstructor@731
 }
 
-LazyJavaClassifierType@330['List<E>'] {
+LazyJavaClassifierType@732['List<E>'] {
     arguments = ArrayList@733[1] { TypeProjectionImpl@734 }
     classifier = JavaClassImpl@735['List']
     memberScope = SubstitutingScope@736
     nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@732
-}
-
-LazyJavaClassifierType@737['List<E>'] {
-    arguments = ArrayList@738[1] { TypeProjectionImpl@739 }
-    classifier = JavaClassImpl@740['List']
-    memberScope = SubstitutingScope@741
-    nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@732
+    typeConstructor = DeserializedClassTypeConstructor@731
 }
 
 LazyJavaClassifierType@325['List<E>'] {
+    arguments = ArrayList@737[1] { TypeProjectionImpl@738 }
+    classifier = JavaClassImpl@739['List']
+    memberScope = SubstitutingScope@740
+    nullable = 'false': Boolean@343
+    typeConstructor = DeserializedClassTypeConstructor@731
+}
+
+LazyJavaClassifierType@741['List<E>'] {
     arguments = ArrayList@742[1] { TypeProjectionImpl@743 }
     classifier = JavaClassImpl@744['List']
     memberScope = SubstitutingScope@745
     nullable = 'false': Boolean@343
-    typeConstructor = DeserializedClassTypeConstructor@732
+    typeConstructor = DeserializedClassTypeConstructor@731
 }
 
 LazyJavaClassifierType@746['List<E>'] {
     arguments = ArrayList@747[1] { TypeProjectionImpl@748 }
-    classifier = JavaClassImpl@740['List']
+    classifier = JavaClassImpl@735['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@730['List']
+    classifier = JavaClassImpl@744['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@758['ListIterator']
+    classifier = JavaClassImpl@774['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@774['ListIterator']
+    classifier = JavaClassImpl@758['ListIterator']
     memberScope = SubstitutingScope@784
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@780
@@ -1456,7 +1456,7 @@ LazyJavaClassifierType@834['Object'] {
 
 LazyJavaClassifierType@836['Object'] {
     arguments = ArrayList@837[empty]
-    classifier = JavaClassImpl@800['Object']
+    classifier = JavaClassImpl@821['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@815['Object']
+    classifier = JavaClassImpl@800['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1472,7 +1472,7 @@ LazyJavaClassifierType@838['Object'] {
 
 LazyJavaClassifierType@840['Object'] {
     arguments = ArrayList@841[empty]
-    classifier = JavaClassImpl@821['Object']
+    classifier = JavaClassImpl@818['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@803['Object']
+    classifier = JavaClassImpl@812['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@824['Object']
+    classifier = JavaClassImpl@809['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@809['Object']
+    classifier = JavaClassImpl@815['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@812['Object']
+    classifier = JavaClassImpl@833['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@818['Object']
+    classifier = JavaClassImpl@824['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@833['Object']
+    classifier = JavaClassImpl@803['Object']
     memberScope = DeserializedClassMemberScope@796
     nullable = 'true': Boolean@383
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1672,49 +1672,49 @@ LazyJavaClassifierType@904['T'] {
     arguments = ArrayList@905[empty]
     classifier = JavaTypeParameterImpl@906['T']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
 }
 
-LazyJavaClassifierType@908['T'] {
-    arguments = ArrayList@909[empty]
-    classifier = JavaTypeParameterImpl@910['T']
+LazyJavaClassifierType@907['T'] {
+    arguments = ArrayList@908[empty]
+    classifier = JavaTypeParameterImpl@909['T']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
 }
 
 LazyJavaClassifierType@911['T'] {
     arguments = ArrayList@912[empty]
     classifier = JavaTypeParameterImpl@913['T']
     nullable = 'false': Boolean@343
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
 }
 
 LazyJavaClassifierType@914['T'] {
     arguments = ArrayList@915[empty]
     classifier = JavaTypeParameterImpl@913['T']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
 }
 
 LazyJavaClassifierType@916['T'] {
     arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@902['T']
+    classifier = JavaTypeParameterImpl@909['T']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
 }
 
 LazyJavaClassifierType@918['T'] {
     arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@910['T']
+    classifier = JavaTypeParameterImpl@906['T']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
 }
 
 LazyJavaClassifierType@920['T'] {
     arguments = ArrayList@921[empty]
-    classifier = JavaTypeParameterImpl@906['T']
+    classifier = JavaTypeParameterImpl@902['T']
     nullable = 'true': Boolean@383
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@903
 }
 
 LazyJavaPackageFragmentProvider@922 {
@@ -1765,23 +1765,23 @@ LazyJavaPackageFragment@938['util'] {
     classes('ArrayList': Name@956) = LazyJavaClassDescriptor@163['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@957
 }
 
-LazyJavaTypeParameterDescriptor@318['E'] {
+LazyJavaTypeParameterDescriptor@322['E'] {
     defaultType = JetTypeImpl@958['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@495
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
     upperBounds = LinkedHashSet@959[1] { NullableType@960 }
     upperBoundsAsType = NullableType@960
 }
 
 LazyJavaTypeParameterDescriptor@327['E'] {
     defaultType = JetTypeImpl@961['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@467
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@474
     upperBounds = LinkedHashSet@962[1] { NullableType@963 }
     upperBoundsAsType = NullableType@963
 }
 
-LazyJavaTypeParameterDescriptor@322['E'] {
+LazyJavaTypeParameterDescriptor@318['E'] {
     defaultType = JetTypeImpl@964['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@463
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@470
     upperBounds = LinkedHashSet@965[1] { NullableType@966 }
     upperBoundsAsType = NullableType@966
 }
@@ -1794,121 +1794,121 @@ LazyJavaTypeParameterDescriptor@967['T'] {
 }
 
 LazyJavaTypeParameterDescriptor@971['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@907
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@910
     upperBounds = LinkedHashSet@972[1] { NullableType@973 }
     upperBoundsAsType = NullableType@973
 }
 
 LazyJavaTypeParameterResolver@974 {
-    resolve(JavaTypeParameterImpl@975['E']) = LazyJavaTypeParameterDescriptor@327['E']
+    resolve(JavaTypeParameterImpl@975['E']) = LazyJavaTypeParameterDescriptor@322['E']
 }
 
 LazyJavaTypeParameterResolver@976 {
-    resolve(JavaTypeParameterImpl@977['E']) = LazyJavaTypeParameterDescriptor@322['E']
+    resolve(JavaTypeParameterImpl@977['E']) = LazyJavaTypeParameterDescriptor@318['E']
 }
 
 LazyJavaTypeParameterResolver@978 {
-    resolve(JavaTypeParameterImpl@979['E']) = LazyJavaTypeParameterDescriptor@318['E']
+    resolve(JavaTypeParameterImpl@979['E']) = LazyJavaTypeParameterDescriptor@327['E']
 }
 
 LazyJavaTypeParameterResolver@980 {
-    resolve(JavaTypeParameterImpl@546['E']) = null
-}
-
-LazyJavaTypeParameterResolver@981 {
-    resolve(JavaTypeParameterImpl@501['E']) = null
-}
-
-LazyJavaTypeParameterResolver@982 {
-    resolve(JavaTypeParameterImpl@567['E']) = null
-}
-
-LazyJavaTypeParameterResolver@983 {
-    resolve(JavaTypeParameterImpl@555['E']) = null
-}
-
-LazyJavaTypeParameterResolver@984 {
-    resolve(JavaTypeParameterImpl@476['E']) = null
-}
-
-LazyJavaTypeParameterResolver@985 {
-    resolve(JavaTypeParameterImpl@504['E']) = null
-}
-
-LazyJavaTypeParameterResolver@986 {
-    resolve(JavaTypeParameterImpl@558['E']) = null
-}
-
-LazyJavaTypeParameterResolver@987 {
-    resolve(JavaTypeParameterImpl@466['E']) = null
-}
-
-LazyJavaTypeParameterResolver@988 {
-    resolve(JavaTypeParameterImpl@498['E']) = null
-}
-
-LazyJavaTypeParameterResolver@989 {
-    resolve(JavaTypeParameterImpl@597['E']) = null
-}
-
-LazyJavaTypeParameterResolver@990 {
-    resolve(JavaTypeParameterImpl@564['E']) = null
-}
-
-LazyJavaTypeParameterResolver@991 {
-    resolve(JavaTypeParameterImpl@570['E']) = null
-}
-
-LazyJavaTypeParameterResolver@992 {
-    resolve(JavaTypeParameterImpl@488['E']) = null
-}
-
-LazyJavaTypeParameterResolver@993 {
-    resolve(JavaTypeParameterImpl@470['E']) = null
-}
-
-LazyJavaTypeParameterResolver@994 {
-    resolve(JavaTypeParameterImpl@540['E']) = null
-}
-
-LazyJavaTypeParameterResolver@995 {
-    resolve(JavaTypeParameterImpl@479['E']) = null
-}
-
-LazyJavaTypeParameterResolver@996 {
-    resolve(JavaTypeParameterImpl@534['E']) = null
-}
-
-LazyJavaTypeParameterResolver@997 {
     resolve(JavaTypeParameterImpl@531['E']) = null
 }
 
-LazyJavaTypeParameterResolver@998 {
-    resolve(JavaTypeParameterImpl@588['E']) = null
+LazyJavaTypeParameterResolver@981 {
+    resolve(JavaTypeParameterImpl@537['E']) = null
 }
 
-LazyJavaTypeParameterResolver@999 {
-    resolve(JavaTypeParameterImpl@549['E']) = null
+LazyJavaTypeParameterResolver@982 {
+    resolve(JavaTypeParameterImpl@477['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1000 {
+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 {
+    resolve(JavaTypeParameterImpl@591['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1000 {
+    resolve(JavaTypeParameterImpl@594['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1001 {
-    resolve(JavaTypeParameterImpl@482['E']) = null
+    resolve(JavaTypeParameterImpl@540['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1002 {
-    resolve(JavaTypeParameterImpl@573['E']) = null
+    resolve(JavaTypeParameterImpl@603['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1003 {
-    resolve(JavaTypeParameterImpl@585['E']) = null
+    resolve(JavaTypeParameterImpl@573['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1004 {
-    resolve(JavaTypeParameterImpl@525['E']) = null
+    resolve(JavaTypeParameterImpl@588['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1005 {
@@ -1918,3 +1918,13 @@ LazyJavaTypeParameterResolver@1005 {
 LazyJavaTypeParameterResolver@1007 {
     resolve(JavaTypeParameterImpl@1008['T']) = LazyJavaTypeParameterDescriptor@967['T']
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/VarargTypes.lazy.log b/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
index ef8dfedd93b..27d1e69489b 100644
--- a/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/VarargTypes.lazy.log
@@ -59,14 +59,14 @@ LazyJavaClassifierType@37['T'] {
 
 LazyJavaClassifierType@40['T'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@32['T']
+    classifier = JavaTypeParameterImpl@36['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
 LazyJavaClassifierType@42['T'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaTypeParameterImpl@36['T']
+    classifier = JavaTypeParameterImpl@32['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
@@ -193,8 +193,7 @@ LazyJavaPackageFragment@48['<root>'] {
     classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('java': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('toFloat': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@136
     functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
@@ -202,87 +201,249 @@ LazyJavaPackageFragment@48['<root>'] {
     functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('java': Name@165) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('toFloat': Name@163) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@166 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('java': Name@164) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@136
 }
 
 LazyJavaPackageFragment@69['java'] {
-    classes('lang': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('util': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('lang': Name@170) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('util': Name@171) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@167
+    classes('util': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@167
+    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@167
+    functions('lang': Name@169) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@167
+    functions('util': Name@170) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@167
+    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@167
 }
 
 LazyJavaPackageFragment@71['lang'] {
-    classes('foob': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('fooc': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('food': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('foof': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('fooi': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('toFloat': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('foof': Name@158) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('toFloat': Name@163) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    memberIndex = computeMemberIndex$1@174 // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('foob': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('fooc': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('food': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('foof': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('fooi': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('foof': Name@158) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    memberIndex = computeMemberIndex$1@173 // through LazyPackageFragmentScopeForJavaPackage@172
 }
 
 LazyJavaPackageFragment@92['util'] {
-    classes('Array': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Arrays': Name@137) = LazyJavaClassDescriptor@0['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Boolean': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('BooleanArray': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Byte': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('ByteArray': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Char': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('CharArray': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Double': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('DoubleArray': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Float': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('FloatArray': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Int': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('IntArray': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Long': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('LongArray': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Short': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('ShortArray': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('String': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('foob': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('fooc': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('food': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('foof': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('fooi': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('toFloat': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    deserializedPackageScope = Empty@164 // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('foof': Name@158) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('toFloat': Name@163) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    memberIndex = computeMemberIndex$1@176 // through LazyPackageFragmentScopeForJavaPackage@175
+    classes('Array': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Arrays': Name@137) = LazyJavaClassDescriptor@0['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Boolean': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('BooleanArray': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Byte': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('ByteArray': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Char': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('CharArray': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Double': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('DoubleArray': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Float': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('FloatArray': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Int': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('IntArray': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Long': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('LongArray': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('Short': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('ShortArray': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('String': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('foob': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('fooc': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('food': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('foof': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('fooi': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('fool': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('foos': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@174
+    deserializedPackageScope = Empty@163 // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('foob': Name@155) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('fooc': Name@156) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('food': Name@157) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('foof': Name@158) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('fooi': Name@159) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('fool': Name@160) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
+    functions('foos': Name@161) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@174
+    memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@174
 }
 
-LazyJavaTypeParameterDescriptor@177['T'] {
+LazyJavaTypeParameterDescriptor@176['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
-    upperBounds = LinkedHashSet@178[1] { NullableType@179 }
-    upperBoundsAsType = NullableType@179
+    upperBounds = LinkedHashSet@177[1] { NullableType@178 }
+    upperBoundsAsType = NullableType@178
 }
 
-LazyJavaTypeParameterResolver@180 {
-    resolve(JavaTypeParameterImpl@181['T']) = LazyJavaTypeParameterDescriptor@177['T']
+LazyJavaTypeParameterResolver@179 {
+    resolve(JavaTypeParameterImpl@180['T']) = LazyJavaTypeParameterDescriptor@176['T']
+}
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@7[empty]
+    <name not found> = EmptyList@7[empty]
+}
+
+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@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[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[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]
+    <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]
+    <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]
+    <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@268 {
+    <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 0861f7e5f5c..10cfa726b69 100644
--- a/compiler/testData/diagnostics/tests/Varargs.lazy.log
+++ b/compiler/testData/diagnostics/tests/Varargs.lazy.log
@@ -47,3 +47,149 @@ LazyJavaPackageFragment@10['lang'] {
     functions('v1': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <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 }
+    <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> = 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@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]
+}
+
+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@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]
+}
+
+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 fbcb74c91dd..54441963349 100644
--- a/compiler/testData/diagnostics/tests/Variance.lazy.log
+++ b/compiler/testData/diagnostics/tests/Variance.lazy.log
@@ -60,3 +60,163 @@ LazyJavaPackageFragment@14['lang'] {
     functions('copy4': Name@53) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
 }
+
+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]
+    <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@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]
+    <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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@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]
+    <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@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[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> = 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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
index 2df321ede69..4c670d12ac7 100644
--- a/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/AmbigiousAnnotationConstructor.lazy.log
@@ -66,14 +66,14 @@ LazyJavaClassifierType@43['E'] {
 
 LazyJavaClassifierType@46['E'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaTypeParameterImpl@41['E']
+    classifier = JavaTypeParameterImpl@45['E']
     nullable = 'true': Boolean@37
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
 }
 
 LazyJavaClassifierType@48['E'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaTypeParameterImpl@45['E']
+    classifier = JavaTypeParameterImpl@41['E']
     nullable = 'true': Boolean@37
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@42
 }
@@ -153,3 +153,91 @@ LazyJavaTypeParameterDescriptor@24['E'] {
 LazyJavaTypeParameterResolver@107 {
     resolve(JavaTypeParameterImpl@108['E']) = LazyJavaTypeParameterDescriptor@24['E']
 }
+
+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 }
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+    <name not found> = EmptyList@89[empty]
+}
+
+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]
+    <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 {
+    <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]
+    <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 {
+    <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/annotations/AnnotatedConstructorParams.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
index f40edb103e9..20776d58c5c 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotatedConstructorParams.lazy.log
@@ -38,53 +38,47 @@ LazyAnnotationDescriptor@20 {
 LazyJavaClassDescriptor@24['Appendable'] {
     functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
     memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@27
-    properties('println': Name@29) = EmptyList@26[empty] // through LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
-LazyJavaClassDescriptor@31['AutoCloseable'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
-    properties('println': Name@29) = EmptyList@26[empty] // through LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
+LazyJavaClassDescriptor@30['AutoCloseable'] {
+    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@31
+    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@31
+    typeConstructor = LazyJavaClassTypeConstructor@33['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@35['Closeable'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    properties('println': Name@29) = EmptyList@26[empty] // through LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Closeable']
+LazyJavaClassDescriptor@34['Closeable'] {
+    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@35
+    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@37['Closeable']
 }
 
-LazyJavaClassDescriptor@39['Deprecated'] {
-    constructors = ArrayList@40[1] { JavaConstructorDescriptor@41['<init>'] } // through LazyJavaClassMemberScope@42
-    defaultType = JetTypeImpl@43['Deprecated']
+LazyJavaClassDescriptor@38['Deprecated'] {
+    constructors = ArrayList@39[1] { JavaConstructorDescriptor@40['<init>'] } // through LazyJavaClassMemberScope@41
+    defaultType = JetTypeImpl@42['Deprecated']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@44['Deprecated']
+    typeConstructor = LazyJavaClassTypeConstructor@43['Deprecated']
 }
 
-LazyJavaClassDescriptor@45['FilterOutputStream'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@46
-    memberIndex = computeMemberIndex$1@47 // through LazyJavaClassMemberScope@46
-    properties('println': Name@29) = EmptyList@26[empty] // through LazyJavaClassMemberScope@46
-    typeConstructor = LazyJavaClassTypeConstructor@48['FilterOutputStream']
+LazyJavaClassDescriptor@44['FilterOutputStream'] {
+    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@45
+    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@45
+    typeConstructor = LazyJavaClassTypeConstructor@47['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@49['OutputStream'] {
-    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
-    properties('println': Name@29) = EmptyList@26[empty] // through LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['OutputStream']
+LazyJavaClassDescriptor@48['OutputStream'] {
+    functions('println': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@49
+    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
+    typeConstructor = LazyJavaClassTypeConstructor@51['OutputStream']
 }
 
-LazyJavaClassDescriptor@53['PrintStream'] {
-    defaultType = JetTypeImpl@54['PrintStream']
-    enumEntryIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@56
-    functions('println': Name@29) = ArrayList@57[10] { JavaMethodDescriptor@58['println'], JavaMethodDescriptor@59['println'], JavaMethodDescriptor@60['println'], ... } // through LazyJavaClassMemberScope@56
-    memberIndex = computeMemberIndex$1@61 // through LazyJavaClassMemberScope@56
-    nestedClassIndex = LinkedHashMap@62 // through LazyJavaClassMemberScope@56
-    nestedClasses('println': Name@29) = null // through LazyJavaClassMemberScope@56
-    properties('println': Name@29) = EmptyList@26[empty] // through LazyJavaClassMemberScope@56
+LazyJavaClassDescriptor@52['PrintStream'] {
+    defaultType = JetTypeImpl@53['PrintStream']
+    enumEntryIndex = LinkedHashMap@54 // through LazyJavaClassMemberScope@55
+    functions('println': Name@56) = ArrayList@57[10] { JavaMethodDescriptor@58['println'], JavaMethodDescriptor@59['println'], JavaMethodDescriptor@60['println'], ... } // through LazyJavaClassMemberScope@55
+    memberIndex = computeMemberIndex$1@61 // through LazyJavaClassMemberScope@55
+    nestedClassIndex = LinkedHashMap@62 // through LazyJavaClassMemberScope@55
+    nestedClasses('println': Name@56) = null // through LazyJavaClassMemberScope@55
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@63['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@64['PrintStream']
 }
@@ -107,31 +101,31 @@ LazyJavaClassDescriptor@71['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@81['System']
 }
 
-LazyJavaClassTypeConstructor@30['Appendable'] {
+LazyJavaClassTypeConstructor@29['Appendable'] {
     parameters = ArrayList@82[empty]
     supertypes = ArrayList@83[1] { JetTypeImpl@84['Any'] }
 }
 
-LazyJavaClassTypeConstructor@34['AutoCloseable'] {
+LazyJavaClassTypeConstructor@33['AutoCloseable'] {
     parameters = ArrayList@85[empty]
     supertypes = ArrayList@86[1] { JetTypeImpl@84['Any'] }
 }
 
-LazyJavaClassTypeConstructor@38['Closeable'] {
+LazyJavaClassTypeConstructor@37['Closeable'] {
     parameters = ArrayList@87[empty]
     supertypes = ArrayList@88[1] { LazyJavaClassifierType@89['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@44['Deprecated'] {
+LazyJavaClassTypeConstructor@43['Deprecated'] {
     parameters = ArrayList@90[empty]
 }
 
-LazyJavaClassTypeConstructor@48['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@47['FilterOutputStream'] {
     parameters = ArrayList@91[empty]
     supertypes = ArrayList@92[1] { LazyJavaClassifierType@93['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@52['OutputStream'] {
+LazyJavaClassTypeConstructor@51['OutputStream'] {
     parameters = ArrayList@94[empty]
     supertypes = ArrayList@95[1] { LazyJavaClassifierType@96['Closeable'] }
 }
@@ -153,35 +147,35 @@ LazyJavaClassifierType@100['Appendable'] {
     arguments = ArrayList@104[empty]
     classifier = JavaClassImpl@105['Appendable']
     memberScope = LazyJavaClassMemberScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@30['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@89['AutoCloseable'] {
     arguments = ArrayList@106[empty]
     classifier = JavaClassImpl@107['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@32
-    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
-}
-
-LazyJavaClassifierType@101['Closeable'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['Closeable']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Closeable']
+    memberScope = LazyJavaClassMemberScope@31
+    typeConstructor = LazyJavaClassTypeConstructor@33['AutoCloseable']
 }
 
 LazyJavaClassifierType@96['Closeable'] {
+    arguments = ArrayList@108[empty]
+    classifier = JavaClassImpl@109['Closeable']
+    memberScope = LazyJavaClassMemberScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@37['Closeable']
+}
+
+LazyJavaClassifierType@101['Closeable'] {
     arguments = ArrayList@110[empty]
     classifier = JavaClassImpl@111['Closeable']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@38['Closeable']
+    memberScope = LazyJavaClassMemberScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@37['Closeable']
 }
 
 LazyJavaClassifierType@99['FilterOutputStream'] {
     arguments = ArrayList@112[empty]
     classifier = JavaClassImpl@113['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@46
-    typeConstructor = LazyJavaClassTypeConstructor@48['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@45
+    typeConstructor = LazyJavaClassTypeConstructor@47['FilterOutputStream']
 }
 
 LazyJavaClassifierType@114['Flushable'] {
@@ -226,14 +220,14 @@ LazyJavaClassifierType@130['Object'] {
 LazyJavaClassifierType@93['OutputStream'] {
     arguments = ArrayList@132[empty]
     classifier = JavaClassImpl@133['OutputStream']
-    memberScope = LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['OutputStream']
+    memberScope = LazyJavaClassMemberScope@49
+    typeConstructor = LazyJavaClassTypeConstructor@51['OutputStream']
 }
 
 LazyJavaClassifierType@134['PrintStream'] {
     arguments = ArrayList@135[empty]
     classifier = JavaClassImpl@136['PrintStream']
-    memberScope = LazyJavaClassMemberScope@56
+    memberScope = LazyJavaClassMemberScope@55
     nullable = 'false': Boolean@119
     typeConstructor = LazyJavaClassTypeConstructor@64['PrintStream']
 }
@@ -303,12 +297,12 @@ LazyJavaPackageFragmentProvider@148 {
     packageFragments('kotlin.suppresswarnings': FqName@187) = null
     packageFragments('suppresswarnings': FqName@188) = null
     topLevelClasses(JavaClassImpl@105['Appendable']) = LazyJavaClassDescriptor@24['Appendable']
-    topLevelClasses(JavaClassImpl@107['AutoCloseable']) = LazyJavaClassDescriptor@31['AutoCloseable']
-    topLevelClasses(JavaClassImpl@109['Closeable']) = LazyJavaClassDescriptor@35['Closeable']
-    topLevelClasses(JavaClassImpl@189['Deprecated']) = LazyJavaClassDescriptor@39['Deprecated']
-    topLevelClasses(JavaClassImpl@113['FilterOutputStream']) = LazyJavaClassDescriptor@45['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@133['OutputStream']) = LazyJavaClassDescriptor@49['OutputStream']
-    topLevelClasses(JavaClassImpl@136['PrintStream']) = LazyJavaClassDescriptor@53['PrintStream']
+    topLevelClasses(JavaClassImpl@107['AutoCloseable']) = LazyJavaClassDescriptor@30['AutoCloseable']
+    topLevelClasses(JavaClassImpl@111['Closeable']) = LazyJavaClassDescriptor@34['Closeable']
+    topLevelClasses(JavaClassImpl@189['Deprecated']) = LazyJavaClassDescriptor@38['Deprecated']
+    topLevelClasses(JavaClassImpl@113['FilterOutputStream']) = LazyJavaClassDescriptor@44['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@133['OutputStream']) = LazyJavaClassDescriptor@48['OutputStream']
+    topLevelClasses(JavaClassImpl@136['PrintStream']) = LazyJavaClassDescriptor@52['PrintStream']
     topLevelClasses(JavaClassImpl@190['SuppressWarnings']) = LazyJavaClassDescriptor@65['SuppressWarnings']
     topLevelClasses(JavaClassImpl@191['System']) = LazyJavaClassDescriptor@71['System']
 }
@@ -321,13 +315,66 @@ LazyJavaPackageFragment@166['java'] {
 }
 
 LazyJavaPackageFragment@170['lang'] {
-    classes('Deprecated': Name@197) = LazyJavaClassDescriptor@39['Deprecated'] // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('Deprecated': Name@197) = LazyJavaClassDescriptor@38['Deprecated'] // through LazyPackageFragmentScopeForJavaPackage@198
     classes('SuppressWarnings': Name@199) = LazyJavaClassDescriptor@65['SuppressWarnings'] // through LazyPackageFragmentScopeForJavaPackage@198
     classes('System': Name@200) = LazyJavaClassDescriptor@71['System'] // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('println': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@198
     deserializedPackageScope = Empty@194 // through LazyPackageFragmentScopeForJavaPackage@198
     functions('Deprecated': Name@201) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@198
     functions('SuppressWarnings': Name@202) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('println': Name@29) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@198
     memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@198
 }
+
+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]
+    <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@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> = 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/annotations/AnnotationsForClasses.lazy.log b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
index d3d28dd2eac..0656b4967a4 100644
--- a/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/AnnotationsForClasses.lazy.log
@@ -49,3 +49,13 @@ LazyJavaPackageFragment@20['lang'] {
     classes('Deprecated': Name@38) = LazyJavaClassDescriptor@6['Deprecated'] // through LazyPackageFragmentScopeForJavaPackage@39
     classes('java': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
index c5a850b57d4..0971a62741f 100644
--- a/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/BasicAnnotations.lazy.log
@@ -63,3 +63,36 @@ LazyJavaPackageFragment@27['java'] {
     functions('lang': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@47
 }
+
+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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
index be0392b162c..3ef6796f705 100644
--- a/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/ConstructorCall.lazy.log
@@ -27,51 +27,46 @@ LazyJavaClassDescriptor@18['AnnotatedElement'] {
     defaultType = JetTypeImpl@19['AnnotatedElement']
     functions('getAnnotation': Name@20) = ArrayList@21[1] { JavaMethodDescriptor@22['getAnnotation'] } // through LazyJavaClassMemberScope@23
     memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    properties('getAnnotation': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@28['AnnotatedElement']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@26['AnnotatedElement']
 }
 
-LazyJavaClassDescriptor@29['Class'] {
-    defaultType = JetTypeImpl@30['Class<1>']
-    enumEntryIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@32
+LazyJavaClassDescriptor@27['Class'] {
+    defaultType = JetTypeImpl@28['Class<1>']
+    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@30
     functionTypeForSamInterface = null
-    functions('getAnnotation': Name@25) = ArrayList@33[1] { JavaMethodDescriptor@34['getAnnotation'] } // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@32
-    nestedClasses('getAnnotation': Name@25) = null // through LazyJavaClassMemberScope@32
-    properties('getAnnotation': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['Class']
+    functions('getAnnotation': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['getAnnotation'] } // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@30
+    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@30
+    nestedClasses('getAnnotation': Name@31) = null // through LazyJavaClassMemberScope@30
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
 }
 
-LazyJavaClassDescriptor@39['GenericDeclaration'] {
-    functions('getAnnotation': Name@20) = EmptyList@26[empty] // through LazyJavaClassMemberScope@40
+LazyJavaClassDescriptor@38['GenericDeclaration'] {
+    functions('getAnnotation': Name@20) = EmptyList@39[empty] // through LazyJavaClassMemberScope@40
     memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    properties('getAnnotation': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@40
     typeConstructor = LazyJavaClassTypeConstructor@42['GenericDeclaration']
 }
 
 LazyJavaClassDescriptor@43['Serializable'] {
-    functions('getAnnotation': Name@20) = EmptyList@26[empty] // through LazyJavaClassMemberScope@44
+    functions('getAnnotation': Name@20) = EmptyList@39[empty] // through LazyJavaClassMemberScope@44
     memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
-    properties('getAnnotation': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@44
     typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
 }
 
 LazyJavaClassDescriptor@47['Type'] {
-    functions('getAnnotation': Name@20) = EmptyList@26[empty] // through LazyJavaClassMemberScope@48
+    functions('getAnnotation': Name@20) = EmptyList@39[empty] // through LazyJavaClassMemberScope@48
     memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@48
-    properties('getAnnotation': Name@25) = EmptyList@26[empty] // through LazyJavaClassMemberScope@48
     typeConstructor = LazyJavaClassTypeConstructor@50['Type']
 }
 
-LazyJavaClassTypeConstructor@28['AnnotatedElement'] {
+LazyJavaClassTypeConstructor@26['AnnotatedElement'] {
     parameters = ArrayList@51[empty]
     supertypes = ArrayList@52[1] { JetTypeImpl@53['Any'] }
 }
 
-LazyJavaClassTypeConstructor@38['Class'] {
+LazyJavaClassTypeConstructor@37['Class'] {
     parameters = ArrayList@54[1] { LazyJavaTypeParameterDescriptor@55['T'] }
     supertypes = ArrayList@56[4] { LazyJavaClassifierType@57['Serializable'], LazyJavaClassifierType@58['GenericDeclaration'], LazyJavaClassifierType@59['Type'], ... }
 }
@@ -137,7 +132,7 @@ LazyJavaClassifierType@84['AnnotatedElement'] {
     arguments = ArrayList@85[empty]
     classifier = JavaClassImpl@86['AnnotatedElement']
     memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@28['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@26['AnnotatedElement']
 }
 
 LazyJavaClassifierType@87['Annotation'] {
@@ -158,7 +153,7 @@ LazyJavaClassifierType@92['Annotation'] {
 
 LazyJavaClassifierType@95['Annotation'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@94['Annotation']
+    classifier = JavaClassImpl@89['Annotation']
     memberScope = DeserializedClassMemberScope@90
     nullable = 'true': Boolean@79
     typeConstructor = DeserializedClassTypeConstructor@91
@@ -166,7 +161,7 @@ LazyJavaClassifierType@95['Annotation'] {
 
 LazyJavaClassifierType@97['Annotation'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@89['Annotation']
+    classifier = JavaClassImpl@94['Annotation']
     memberScope = DeserializedClassMemberScope@90
     nullable = 'true': Boolean@79
     typeConstructor = DeserializedClassTypeConstructor@91
@@ -177,7 +172,7 @@ LazyJavaClassifierType@99['Class<A>'] {
     classifier = JavaClassImpl@102['Class']
     memberScope = SubstitutingScope@103
     nullable = 'false': Boolean@69
-    typeConstructor = LazyJavaClassTypeConstructor@38['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
 }
 
 LazyJavaClassifierType@104['Class<A>'] {
@@ -185,7 +180,7 @@ LazyJavaClassifierType@104['Class<A>'] {
     classifier = JavaClassImpl@102['Class']
     memberScope = SubstitutingScope@107
     nullable = 'true': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@38['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
 }
 
 LazyJavaClassifierType@108['Class<T>'] {
@@ -193,7 +188,7 @@ LazyJavaClassifierType@108['Class<T>'] {
     classifier = JavaClassImpl@111['Class']
     memberScope = SubstitutingScope@112
     nullable = 'false': Boolean@69
-    typeConstructor = LazyJavaClassTypeConstructor@38['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
 }
 
 LazyJavaClassifierType@113['Class<T>'] {
@@ -201,7 +196,7 @@ LazyJavaClassifierType@113['Class<T>'] {
     classifier = JavaClassImpl@111['Class']
     memberScope = SubstitutingScope@116
     nullable = 'true': Boolean@79
-    typeConstructor = LazyJavaClassTypeConstructor@38['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@37['Class']
 }
 
 LazyJavaClassifierType@58['GenericDeclaration'] {
@@ -266,21 +261,21 @@ LazyJavaClassifierType@139['T'] {
 
 LazyJavaClassifierType@142['T'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@141['T']
+    classifier = JavaTypeParameterImpl@138['T']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
 
 LazyJavaClassifierType@144['T'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@138['T']
+    classifier = JavaTypeParameterImpl@134['T']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
 
 LazyJavaClassifierType@146['T'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@134['T']
+    classifier = JavaTypeParameterImpl@141['T']
     nullable = 'true': Boolean@79
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
 }
@@ -332,8 +327,8 @@ LazyJavaPackageFragmentProvider@150 {
     packageFragments('kotlin.io': FqName@192) = null
     packageFragments('kotlin.jvm': FqName@193) = null
     topLevelClasses(JavaClassImpl@86['AnnotatedElement']) = LazyJavaClassDescriptor@18['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@194['Class']) = LazyJavaClassDescriptor@29['Class']
-    topLevelClasses(JavaClassImpl@118['GenericDeclaration']) = LazyJavaClassDescriptor@39['GenericDeclaration']
+    topLevelClasses(JavaClassImpl@194['Class']) = LazyJavaClassDescriptor@27['Class']
+    topLevelClasses(JavaClassImpl@118['GenericDeclaration']) = LazyJavaClassDescriptor@38['GenericDeclaration']
     topLevelClasses(JavaClassImpl@131['Serializable']) = LazyJavaClassDescriptor@43['Serializable']
     topLevelClasses(JavaClassImpl@149['Type']) = LazyJavaClassDescriptor@47['Type']
 }
@@ -345,75 +340,256 @@ LazyJavaPackageFragment@152['<root>'] {
     classes('Int': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@196
     classes('String': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@196
     classes('bar': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('getAnnotation': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@196
     classes('invoke': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@196
     classes('javaClass': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    classes('value': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@196
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('Ann': Name@195) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('Ann1': Name@197) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('bar': Name@201) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('getAnnotation': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('invoke': Name@202) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('javaClass': Name@203) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    functions('value': Name@204) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@196
-    memberIndex = computeMemberIndex$1@206 // through LazyPackageFragmentScopeForJavaPackage@196
+    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@196
+    functions('Ann': Name@195) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
+    functions('Ann1': Name@197) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
+    functions('bar': Name@201) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
+    functions('invoke': Name@202) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
+    functions('javaClass': Name@203) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@196
+    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@196
 }
 
 LazyJavaPackageFragment@166['java'] {
-    classes('lang': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('lang': Name@209) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('lang': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@207
+    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@207
+    functions('lang': Name@208) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@207
+    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@207
 }
 
 LazyJavaPackageFragment@170['lang'] {
-    classes('Ann': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('Ann1': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('Class': Name@198) = LazyJavaClassDescriptor@29['Class'] // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('bar': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('getAnnotation': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('invoke': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('javaClass': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('value': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('Ann': Name@195) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('Ann1': Name@197) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('bar': Name@201) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('getAnnotation': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('invoke': Name@202) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('javaClass': Name@203) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('value': Name@204) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    memberIndex = computeMemberIndex$1@212 // through LazyPackageFragmentScopeForJavaPackage@211
+    classes('Ann': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('Ann1': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('Class': Name@198) = LazyJavaClassDescriptor@27['Class'] // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('bar': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('invoke': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('javaClass': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('Ann': Name@195) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('Ann1': Name@197) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('bar': Name@201) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('invoke': Name@202) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('javaClass': Name@203) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@210
 }
 
-LazyJavaTypeParameterDescriptor@213['A'] {
-    defaultType = JetTypeImpl@214['A']
+LazyJavaTypeParameterDescriptor@212['A'] {
+    defaultType = JetTypeImpl@213['A']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
-    upperBounds = LinkedHashSet@215[1] { DelegatingFlexibleType@216 }
-    upperBoundsAsType = DelegatingFlexibleType@216
+    upperBounds = LinkedHashSet@214[1] { DelegatingFlexibleType@215 }
+    upperBoundsAsType = DelegatingFlexibleType@215
 }
 
 LazyJavaTypeParameterDescriptor@55['T'] {
-    defaultType = JetTypeImpl@217['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@218
-    upperBounds = LinkedHashSet@219[1] { NullableType@220 }
+    defaultType = JetTypeImpl@216['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@217
+    upperBounds = LinkedHashSet@218[1] { NullableType@219 }
 }
 
-LazyJavaTypeParameterDescriptor@221['T'] {
+LazyJavaTypeParameterDescriptor@220['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@135
-    upperBounds = LinkedHashSet@222[1] { DelegatingFlexibleType@223 }
-    upperBoundsAsType = DelegatingFlexibleType@223
+    upperBounds = LinkedHashSet@221[1] { DelegatingFlexibleType@222 }
+    upperBoundsAsType = DelegatingFlexibleType@222
 }
 
-LazyJavaTypeParameterResolver@224 {
-    resolve(JavaTypeParameterImpl@225['A']) = LazyJavaTypeParameterDescriptor@213['A']
+LazyJavaTypeParameterResolver@223 {
+    resolve(JavaTypeParameterImpl@224['A']) = LazyJavaTypeParameterDescriptor@212['A']
 }
 
-LazyJavaTypeParameterResolver@226 {
-    resolve(JavaTypeParameterImpl@227['T']) = LazyJavaTypeParameterDescriptor@221['T']
+LazyJavaTypeParameterResolver@225 {
+    resolve(JavaTypeParameterImpl@226['T']) = LazyJavaTypeParameterDescriptor@220['T']
 }
 
-LazyJavaTypeParameterResolver@228 {
-    resolve(JavaTypeParameterImpl@229['T']) = LazyJavaTypeParameterDescriptor@55['T']
+LazyJavaTypeParameterResolver@227 {
+    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@55['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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <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@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@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+    <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 cf688ce1760..4fccfaea09d 100644
--- a/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/Deprecated.lazy.log
@@ -57,3 +57,13 @@ LazyJavaPackageFragment@21['lang'] {
     functions('Deprecated': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
index 11977d4a9ae..4c02497b104 100644
--- a/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/JavaAnnotationConstructors.lazy.log
@@ -228,3 +228,98 @@ LazyJavaPackageFragment@110['lang'] {
     functions('annotation': Name@152) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@151
     memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@151
 }
+
+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]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@164 }
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@164 }
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+    <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 {
+    <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@183 {
+    <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@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 {
+    <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/annotations/NonAnnotationClass.lazy.log b/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
index 0b4fe893775..3c17152f3b2 100644
--- a/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/NonAnnotationClass.lazy.log
@@ -22,3 +22,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+    <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 8551243b33c..f490a3e29c9 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationInheritance.lazy.log
@@ -43,3 +43,20 @@ LazyJavaPackageFragment@17['lang'] {
     classes('a': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
     deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
index 712001ead94..bb1a6c8f2de 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/booleanLocalVal.lazy.log
@@ -33,3 +33,18 @@ LazyJavaPackageFragment@13['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 }
+    <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@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
index e4d870091cb..c253281f501 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/compareAndEquals.lazy.log
@@ -27,26 +27,101 @@ LazyJavaPackageFragmentProvider@9 {
 
 LazyJavaPackageFragment@11['<root>'] {
     classes('Boolean': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('compareTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('compareTo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@15['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@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@17['lang'] {
-    classes('compareTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('compareTo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+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@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@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 }
+}
+
+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 }
+}
+
+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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
index 86282d72d86..8d42fba373f 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/enumConst.lazy.log
@@ -50,3 +50,52 @@ LazyJavaPackageFragment@18['lang'] {
     functions('Test': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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 }
+    <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]
+}
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
index eb5af4acfbb..e66a15a47c0 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/javaProperties.lazy.log
@@ -91,3 +91,142 @@ LazyJavaPackageFragment@58['lang'] {
     functions('Test': Name@73) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
 }
+
+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]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <name not found> = EmptyList@27[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@27[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 01f2a7b0fe2..0fc2f9ad30e 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/kotlinProperties.lazy.log
@@ -65,3 +65,78 @@ LazyJavaPackageFragment@24['lang'] {
     classes('i6': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@46
     deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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]
+    <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+    <name not found> = EmptyList@44[empty]
+    <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]
+    <name not found> = EmptyList@44[empty]
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
+    <name not found> = EmptyList@44[empty]
+    <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]
+    <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@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <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 36f63915cbe..f4cb3cab32b 100644
--- a/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/annotationParameterMustBeConstant/strings.lazy.log
@@ -32,24 +32,134 @@ LazyJavaPackageFragmentProvider@13 {
 
 LazyJavaPackageFragment@15['<root>'] {
     classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('topLevel': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('topLevel': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('topLevel': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('plus': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('topLevel': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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]
+    <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@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 }
+}
+
+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[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 }
+}
+
+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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
index 6b628ee1102..de8c15d0ee1 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-negative.lazy.log
@@ -55,3 +55,8 @@ LazyJavaPackageFragment@20['java'] {
 LazyJavaPackageFragment@22['lang'] {
     classes('varargs': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@44
 }
+
+ResolutionTaskHolder@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <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 3bc4464b8cf..901093c57c9 100644
--- a/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/kt1860-positive.lazy.log
@@ -50,3 +50,28 @@ LazyJavaPackageFragment@20['java'] {
     functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
 }
+
+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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log b/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
index 4b16ed14d26..115aed63662 100644
--- a/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onExpression.lazy.log
@@ -25,3 +25,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 ecf77fce22f..4aa66cf2b0f 100644
--- a/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onInitializer.lazy.log
@@ -69,3 +69,23 @@ LazyJavaPackageFragment@32['java'] {
 LazyJavaPackageFragment@34['lang'] {
     classes('aaa': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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/annotations/onLoops.lazy.log b/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
index e10519e13ed..7195a902d5c 100644
--- a/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onLoops.lazy.log
@@ -25,39 +25,54 @@ LazyJavaPackageFragmentProvider@9 {
     packageFragments('kotlin.jvm': FqName@21) = null
 }
 
-LazyJavaPackageFragment@11['<root>'] {
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('rangeTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@22) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('hasNext': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('iterator': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('next': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('rangeTo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
 LazyJavaPackageFragment@14['java'] {
-    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
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
-LazyJavaPackageFragment@16['lang'] {
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('rangeTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('compareTo': Name@22) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('hasNext': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('iterator': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('next': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('rangeTo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+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@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@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> = ArrayList@53[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+    <name not found> = ArrayList@57[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
index e10519e13ed..7195a902d5c 100644
--- a/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onLoopsUnreachable.lazy.log
@@ -25,39 +25,54 @@ LazyJavaPackageFragmentProvider@9 {
     packageFragments('kotlin.jvm': FqName@21) = null
 }
 
-LazyJavaPackageFragment@11['<root>'] {
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('rangeTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@22) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('hasNext': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('iterator': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('next': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('rangeTo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
-}
-
 LazyJavaPackageFragment@14['java'] {
-    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
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
-LazyJavaPackageFragment@16['lang'] {
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('rangeTo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('compareTo': Name@22) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('hasNext': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('iterator': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('next': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('rangeTo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+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@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@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> = ArrayList@53[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+    <name not found> = ArrayList@57[7] { ResolutionCandidate@54, ResolutionCandidate@55, ResolutionCandidate@56, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
index 61ff9558668..951d5625545 100644
--- a/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/annotations/onMultiDeclaration.lazy.log
@@ -37,31 +37,93 @@ LazyJavaPackageFragment@8['<root>'] {
     classes('component1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('component2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('data': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('P': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component1': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('component2': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('P': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('component1': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('component2': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('P': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('component1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('component2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('P': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('component1': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('component2': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('plus': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('P': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('component1': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('component2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('P': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('component1': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('component2': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <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 }
+}
+
+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[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
+    <name not found> = ArrayList@78[8] { ResolutionCandidate@75, ResolutionCandidate@76, ResolutionCandidate@77, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
index fe8509c91ae..e3b56993d6e 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.lazy.log
@@ -13,28 +13,47 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('minus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('minusOne': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('minus': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('minusOne': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('minus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minusOne': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('minusOne': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+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]
+    <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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
index c19b5c99ff5..92e51617a9b 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetVal.lazy.log
@@ -14,24 +14,30 @@ LazyJavaPackageFragmentProvider@3 {
 }
 
 LazyJavaPackageFragment@5['<root>'] {
-    classes('times': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('zz': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('times': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('zz': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('times': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('zz': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('times': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('zz': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
index d74322d735c..0a1501922d0 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.lazy.log
@@ -22,9 +22,18 @@ LazyJavaPackageFragment@9['java'] {
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('times': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('zz': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('zz': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('times': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
index 46e137f1139..b09b759c4ae 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomGetVar.lazy.log
@@ -13,24 +13,30 @@ LazyJavaPackageFragmentProvider@2 {
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    classes('times': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('zz': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('times': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('times': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('zz': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('times': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log b/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
index 30593773bbd..37d40544306 100644
--- a/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CustomSet.lazy.log
@@ -13,24 +13,35 @@ LazyJavaPackageFragmentProvider@2 {
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    classes('div': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('zz': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('div': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('div': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('zz': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('div': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('zz': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
index 6c9df431a4a..961509efbc4 100644
--- a/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.lazy.log
@@ -28,3 +28,10 @@ LazyJavaPackageFragment@9['lang'] {
     classes('a': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
     deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
index c11c06f8456..900b0a8289f 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.lazy.log
@@ -29,3 +29,10 @@ LazyJavaPackageFragment@10['lang'] {
     classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
index ba896a1e504..f1baacb819c 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.lazy.log
@@ -31,3 +31,10 @@ LazyJavaPackageFragment@11['lang'] {
     classes('b': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
index bfd56981132..31384f210d9 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.lazy.log
@@ -29,3 +29,10 @@ LazyJavaPackageFragment@10['lang'] {
     classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
index ebb08765af1..dcce0eebe99 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.lazy.log
@@ -31,3 +31,10 @@ LazyJavaPackageFragment@11['lang'] {
     classes('a': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
index 6daa9e68708..1e7aab74041 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.lazy.log
@@ -30,3 +30,10 @@ LazyJavaPackageFragment@10['lang'] {
     classes('a': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
index 2501e9b6956..2bb14583122 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.lazy.log
@@ -28,3 +28,10 @@ LazyJavaPackageFragment@8['lang'] {
     classes('aa': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
index dbea1bdf6a0..b04a08c3a22 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.lazy.log
@@ -32,3 +32,10 @@ LazyJavaPackageFragment@10['lang'] {
     classes('aa': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
index 935e77472d1..807373572e5 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.lazy.log
@@ -28,3 +28,10 @@ LazyJavaPackageFragment@8['lang'] {
     classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
index b99135c7143..588c451afed 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.lazy.log
@@ -33,3 +33,10 @@ LazyJavaPackageFragment@10['lang'] {
     classes('a': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
index b99135c7143..588c451afed 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.lazy.log
@@ -33,3 +33,10 @@ LazyJavaPackageFragment@10['lang'] {
     classes('a': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
index 28ae4e1caa1..0a6702bb1c6 100644
--- a/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.lazy.log
@@ -33,3 +33,99 @@ LazyJavaPackageFragment@8['lang'] {
     functions('$a': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 0f4de79440c..ff05726a487 100644
--- a/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.lazy.log
@@ -30,3 +30,16 @@ LazyJavaPackageFragment@10['lang'] {
     classes('y': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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> = 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 39dd11dd5d6..0032e45e7c1 100644
--- a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.lazy.log
@@ -85,3 +85,413 @@ LazyJavaPackageFragment@26['lang'] {
     functions('$b': Name@65) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@51
 }
+
+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> = 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 }
+    <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> = 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 }
+    <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> = EmptyList@48[empty]
+    <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> = 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> = 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 }
+    <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@117 {
+    <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> = 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]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
+    <name not found> = EmptyList@48[empty]
+    <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]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
+    <name not found> = EmptyList@48[empty]
+    <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]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@158 {
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@160 }
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@160 }
+    <name not found> = EmptyList@48[empty]
+    <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]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+    <name not found> = EmptyList@48[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@48[empty]
+}
+
+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@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@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@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@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
+    <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]
+    <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@267 {
+    <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 9cb155cce3d..12c3789f422 100644
--- a/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/kt782packageLevel.lazy.log
@@ -33,3 +33,31 @@ LazyJavaPackageFragment@10['lang'] {
     classes('z': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
     deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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]
+    <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]
+}
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log b/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
index 6bb62bd3aa0..33f8310a45e 100644
--- a/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
+++ b/compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.lazy.log
@@ -17,22 +17,21 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log b/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
index a5392ecf326..3aa4b634f89 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedError.lazy.log
@@ -36,3 +36,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <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 fecdbd87b2c..acde626d3f8 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedFine.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 451676ae8df..c8d64a14f07 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedStar.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 b14f534917b..b50d7696167 100644
--- a/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/AsErasedWarning.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 01d1cc4a288..529a8f82666 100644
--- a/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/DowncastMap.lazy.log
@@ -28,22 +28,26 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@10['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@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log b/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
index 501ba1fa6dc..29dbda63c42 100644
--- a/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsArray.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 e453d23d1ec..dcc585c1de4 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForDerivedWithOneSubstitutedAndOneSameGeneric.lazy.log
@@ -39,3 +39,13 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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/cast/IsErasedAllowForExactSupertypeCheck.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
index 3891a6dd9ea..4fb95f7d3dd 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForExactSupertypeCheck.lazy.log
@@ -30,3 +30,13 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
index 210aba707a7..c8368fcaa34 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForOverridenVarianceWithProjection.lazy.log
@@ -32,3 +32,18 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
index 850a5aa81fa..7d6b9a1daec 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithContrvariance.lazy.log
@@ -29,3 +29,18 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
index 850a5aa81fa..7d6b9a1daec 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForSupertypeCheckWithCovariance.lazy.log
@@ -29,3 +29,18 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
index bad577a4443..506a40b959d 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithIrrelevantMixin.lazy.log
@@ -38,3 +38,8 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <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 ddfbb2163bf..a1f24b760e8 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithTwoSameTypeSubstitutions.lazy.log
@@ -37,3 +37,13 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
index 26baec654eb..e3c70ac9247 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowForTypeWithoutTypeArguments.lazy.log
@@ -33,3 +33,13 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
index c162c8bc7df..0270b7f544c 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 40e0114a160..8f277e94bc5 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOut2.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 314b2b7c7cd..26b51be25c8 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowFromOutAtClass.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 7c92e8b5108..a8a65074bbb 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowParameterSubtype.lazy.log
@@ -34,3 +34,13 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
index 3821fe6b7a5..d34bfddc134 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameClassParameter.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 144ecf29b69..ddf8659627f 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedAllowSameParameterParameter.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <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 40e0114a160..8f277e94bc5 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowDifferentArgInvariantPosition.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 210aba707a7..c8368fcaa34 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForOverridenVariance.lazy.log
@@ -32,3 +32,18 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
index 445a9de6162..d6738feb06b 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowForTypeWithConstraints.lazy.log
@@ -29,3 +29,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <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 9170742c055..22f57615ec8 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromAny.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 40e0114a160..8f277e94bc5 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromIn.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 e09c449a32f..a1e8afc0406 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOut.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 314b2b7c7cd..26b51be25c8 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDisallowFromOutAtClass.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 6dd23a2c806..98d550db723 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithFirstInvalid.lazy.log
@@ -35,3 +35,18 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
index 6dd23a2c806..98d550db723 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedDissallowForSubtypeMappedToTwoParamsWithSecondInvalid.lazy.log
@@ -35,3 +35,18 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log b/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
index 664a3058248..703c7122798 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedNonGeneric.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 4c6d1724736..168aaee06a6 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedNullableTasT.lazy.log
@@ -27,3 +27,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <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 bd972692e8f..2a38c0e22e3 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedStar.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 2803b0af1b1..7c42103eb8b 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedTasT.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 a8c76d3285a..8bad9f64594 100644
--- a/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsErasedToErrorType.lazy.log
@@ -36,3 +36,8 @@ LazyJavaPackageFragment@9['java'] {
 LazyJavaPackageFragment@11['lang'] {
     classes('UnresolvedType': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <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 f3462ea9f98..978df9f5d6d 100644
--- a/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsRecursionSustainable.lazy.log
@@ -37,3 +37,28 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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@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> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log b/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
index 4bdb25c98e2..818078ceada 100644
--- a/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsReified.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 c2b0455df43..251e5f59655 100644
--- a/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/IsTraits.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 3806d5131c1..19d11e19f1e 100644
--- a/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/WhenErasedDisallowFromAny.lazy.log
@@ -32,3 +32,8 @@ 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 }
+    <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 4738e2ca0fe..ee993e4679c 100644
--- a/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/WhenWithExpression.lazy.log
@@ -47,3 +47,66 @@ LazyJavaPackageFragment@13['lang'] {
     functions('List': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <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 b7b58d963e2..1199a0b2486 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/AsNestedBare.lazy.log
@@ -26,3 +26,13 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
index 3cac55fbb96..77cc7ae2604 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/AsNullable.lazy.log
@@ -29,3 +29,18 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
index cc1c3db5bfe..ddc27a56f7f 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/AsNullableNotEnough.lazy.log
@@ -19,3 +19,18 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+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@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
index 842b6e068bd..a3d6406993b 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherAs.lazy.log
@@ -49,3 +49,23 @@ LazyJavaPackageFragment@14['java'] {
     functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
index f3b8ab70b48..fc8f9a3209e 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherIs.lazy.log
@@ -41,16 +41,61 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@16['lang'] {
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@50
+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[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 }
+}
+
+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/cast/bare/EitherNotIs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
index f3b8ab70b48..fc8f9a3209e 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherNotIs.lazy.log
@@ -41,16 +41,61 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@16['lang'] {
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@50
+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[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 }
+}
+
+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/cast/bare/EitherSafeAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
index 842b6e068bd..a3d6406993b 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherSafeAs.lazy.log
@@ -49,3 +49,23 @@ LazyJavaPackageFragment@14['java'] {
     functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
index f3b8ab70b48..2a9250939c6 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/EitherWhen.lazy.log
@@ -41,16 +41,51 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Nothing': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@16['lang'] {
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@50
+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[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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
index e88926f5e43..9786ae66b3e 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/ErrorsInSubstitution.lazy.log
@@ -37,3 +37,13 @@ LazyJavaPackageFragment@9['java'] {
 LazyJavaPackageFragment@11['lang'] {
     classes('Foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
index a17fd435ca8..854874d6fd5 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/FromErrorType.lazy.log
@@ -27,3 +27,18 @@ LazyJavaPackageFragment@6['java'] {
 LazyJavaPackageFragment@8['lang'] {
     classes('P': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
index 3cac55fbb96..da2170d38e0 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAs.lazy.log
@@ -29,3 +29,13 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
index cc1c3db5bfe..618e8404a78 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNotEnough.lazy.log
@@ -19,3 +19,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
index 3cac55fbb96..77cc7ae2604 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullable.lazy.log
@@ -29,3 +29,18 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
index cc1c3db5bfe..ddc27a56f7f 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/NullableAsNullableNotEnough.lazy.log
@@ -19,3 +19,18 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+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@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
index ef52fea926c..e303f3ef532 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/RedundantNullable.lazy.log
@@ -33,3 +33,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <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 3453c73af57..e31e1d9a65e 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/ToErrorType.lazy.log
@@ -31,3 +31,13 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     classes('G': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
index cc1c3db5bfe..618e8404a78 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedAs.lazy.log
@@ -19,3 +19,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
index 743dde61792..5d47ed3fa25 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedColon.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 80c15ffdfe9..621f9b27898 100644
--- a/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/bare/UnrelatedIs.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 00314330c87..644ed5b9b6b 100644
--- a/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/isErasedAnyAndStarred.lazy.log
@@ -27,3 +27,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <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 cc97e87a24c..8b52a7ace0c 100644
--- a/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/isErasedTAndStarred.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 80c15ffdfe9..621f9b27898 100644
--- a/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/isErasedUnrelatedAndStarred.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 5bc16a17279..0cecdbfb395 100644
--- a/compiler/testData/diagnostics/tests/cast/kt614.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/kt614.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 060322ff43d..22d91d75ad5 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/CastToNotNullSuper.lazy.log
@@ -13,23 +13,24 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@15) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
-}
-
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+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@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
index 20defac2efa..6506bda0f3a 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedDirect.lazy.log
@@ -135,3 +135,93 @@ LazyJavaPackageFragment@50['lang'] {
     functions('String': Name@89) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@84
 }
+
+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 }
+}
+
+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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
index a2af1039e1b..651ce85708d 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/MappedSubtypes.lazy.log
@@ -90,3 +90,28 @@ LazyJavaPackageFragment@59['lang'] {
     functions('CharSequence': Name@85) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
+
+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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
index 4514a0acd61..c4ce0d466ff 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsRelated.lazy.log
@@ -46,3 +46,128 @@ LazyJavaPackageFragment@15['java'] {
     functions('lang': Name@46) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
 }
+
+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 }
+}
+
+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 }
+}
+
+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> = 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[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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
index 8fd7114d8cc..048c7c27538 100644
--- a/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
+++ b/compiler/testData/diagnostics/tests/cast/neverSucceeds/NoGenericsUnrelated.lazy.log
@@ -37,3 +37,83 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
 }
+
+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> = 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@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 }
+}
+
+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 }
+}
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
index f66bcb55e03..58423c05c17 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/SpreadVarargs.lazy.log
@@ -7,71 +7,63 @@ LazyJavaClassDescriptor@2['AbstractStringBuilder'] {
     functions('append': Name@4) = ArrayList@5[13] { JavaMethodDescriptor@6['append'], JavaMethodDescriptor@7['append'], JavaMethodDescriptor@8['append'], ... } // through LazyJavaClassMemberScope@9
     functions('toString': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['toString'] } // through LazyJavaClassMemberScope@9
     memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@9
-    properties('append': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    properties('toString': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@19['Appendable'] {
-    defaultType = JetTypeImpl@20['Appendable']
-    functions('append': Name@21) = ArrayList@22[3] { JavaMethodDescriptor@23['append'], JavaMethodDescriptor@24['append'], JavaMethodDescriptor@25['append'] } // through LazyJavaClassMemberScope@26
-    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@26
-    properties('append': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@26
-    properties('toString': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+LazyJavaClassDescriptor@16['Appendable'] {
+    defaultType = JetTypeImpl@17['Appendable']
+    functions('append': Name@18) = ArrayList@19[3] { JavaMethodDescriptor@20['append'], JavaMethodDescriptor@21['append'], JavaMethodDescriptor@22['append'] } // through LazyJavaClassMemberScope@23
+    functions('toString': Name@24) = ArrayList@25[1] { DeserializedSimpleFunctionDescriptor@26['toString'] } // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@23
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
-LazyJavaClassDescriptor@33['Serializable'] {
-    defaultType = JetTypeImpl@34['Serializable']
-    functions('append': Name@4) = EmptyList@15[empty] // through LazyJavaClassMemberScope@35
-    functions('toString': Name@10) = ArrayList@36[1] { DeserializedSimpleFunctionDescriptor@37['toString'] } // through LazyJavaClassMemberScope@35
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@35
-    properties('append': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@35
-    properties('toString': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
+LazyJavaClassDescriptor@30['Serializable'] {
+    defaultType = JetTypeImpl@31['Serializable']
+    functions('append': Name@4) = EmptyList@32[empty] // through LazyJavaClassMemberScope@33
+    functions('toString': Name@10) = ArrayList@34[1] { DeserializedSimpleFunctionDescriptor@35['toString'] } // through LazyJavaClassMemberScope@33
+    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@33
+    typeConstructor = LazyJavaClassTypeConstructor@37['Serializable']
 }
 
-LazyJavaClassDescriptor@40['StringBuffer'] {
+LazyJavaClassDescriptor@38['StringBuffer'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
 }
 
-LazyJavaClassDescriptor@42['StringBuilder'] {
-    constructors = ArrayList@43[4] { JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], ... } // through LazyJavaClassMemberScope@47
-    defaultType = JetTypeImpl@48['StringBuilder']
-    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@47
+LazyJavaClassDescriptor@40['StringBuilder'] {
+    constructors = ArrayList@41[4] { JavaConstructorDescriptor@42['<init>'], JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], ... } // through LazyJavaClassMemberScope@45
+    defaultType = JetTypeImpl@46['StringBuilder']
+    enumEntryIndex = LinkedHashMap@47 // through LazyJavaClassMemberScope@45
     functionTypeForSamInterface = null
-    functions('append': Name@14) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@47
-    functions('toString': Name@16) = ArrayList@54[1] { JavaMethodDescriptor@55['toString'] } // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaClassMemberScope@47
-    nestedClassIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@47
-    nestedClasses('append': Name@14) = null // through LazyJavaClassMemberScope@47
-    nestedClasses('toString': Name@16) = null // through LazyJavaClassMemberScope@47
-    properties('append': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@47
-    properties('toString': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@47
+    functions('append': Name@48) = ArrayList@49[14] { JavaMethodDescriptor@50['append'], JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], ... } // through LazyJavaClassMemberScope@45
+    functions('toString': Name@53) = ArrayList@54[1] { JavaMethodDescriptor@55['toString'] } // through LazyJavaClassMemberScope@45
+    memberIndex = computeMemberIndex$1@56 // through LazyJavaClassMemberScope@45
+    nestedClassIndex = LinkedHashMap@57 // through LazyJavaClassMemberScope@45
+    nestedClasses('append': Name@48) = null // through LazyJavaClassMemberScope@45
+    nestedClasses('toString': Name@53) = null // through LazyJavaClassMemberScope@45
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@58['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
-LazyJavaClassTypeConstructor@18['AbstractStringBuilder'] {
+LazyJavaClassTypeConstructor@15['AbstractStringBuilder'] {
     parameters = ArrayList@60[empty]
     supertypes = ArrayList@61[2] { LazyJavaClassifierType@62['Appendable'], LazyJavaClassifierType@63['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@32['Appendable'] {
+LazyJavaClassTypeConstructor@29['Appendable'] {
     parameters = ArrayList@64[empty]
     supertypes = ArrayList@65[1] { JetTypeImpl@66['Any'] }
 }
 
-LazyJavaClassTypeConstructor@39['Serializable'] {
+LazyJavaClassTypeConstructor@37['Serializable'] {
     parameters = ArrayList@67[empty]
     supertypes = ArrayList@68[1] { JetTypeImpl@66['Any'] }
 }
 
-LazyJavaClassTypeConstructor@41['StringBuffer'] {
+LazyJavaClassTypeConstructor@39['StringBuffer'] {
     parameters = ArrayList@69[empty]
     supertypes = ArrayList@70[3] { LazyJavaClassifierType@71['AbstractStringBuilder'], LazyJavaClassifierType@72['Serializable'], LazyJavaClassifierType@73['CharSequence'] }
 }
@@ -85,244 +77,244 @@ LazyJavaClassifierType@76['AbstractStringBuilder'] {
     arguments = ArrayList@79[empty]
     classifier = JavaClassImpl@80['AbstractStringBuilder']
     memberScope = LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@81['AbstractStringBuilder'] {
     arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@85['AbstractStringBuilder'] {
     arguments = ArrayList@86[empty]
     classifier = JavaClassImpl@87['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@88['AbstractStringBuilder'] {
     arguments = ArrayList@89[empty]
     classifier = JavaClassImpl@90['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@91['AbstractStringBuilder'] {
     arguments = ArrayList@92[empty]
     classifier = JavaClassImpl@93['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@94['AbstractStringBuilder'] {
     arguments = ArrayList@95[empty]
     classifier = JavaClassImpl@96['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@97['AbstractStringBuilder'] {
     arguments = ArrayList@98[empty]
     classifier = JavaClassImpl@99['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@100['AbstractStringBuilder'] {
     arguments = ArrayList@101[empty]
     classifier = JavaClassImpl@102['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@103['AbstractStringBuilder'] {
     arguments = ArrayList@104[empty]
     classifier = JavaClassImpl@105['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@106['AbstractStringBuilder'] {
     arguments = ArrayList@107[empty]
     classifier = JavaClassImpl@108['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@109['AbstractStringBuilder'] {
     arguments = ArrayList@110[empty]
     classifier = JavaClassImpl@111['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@112['AbstractStringBuilder'] {
     arguments = ArrayList@113[empty]
     classifier = JavaClassImpl@114['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@115['AbstractStringBuilder'] {
     arguments = ArrayList@116[empty]
     classifier = JavaClassImpl@117['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@118['AbstractStringBuilder'] {
     arguments = ArrayList@119[empty]
     classifier = JavaClassImpl@120['AbstractStringBuilder']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@121['AbstractStringBuilder'] {
     arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@93['AbstractStringBuilder']
+    classifier = JavaClassImpl@120['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@124['AbstractStringBuilder'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@111['AbstractStringBuilder']
+    classifier = JavaClassImpl@93['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@126['AbstractStringBuilder'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@96['AbstractStringBuilder']
+    classifier = JavaClassImpl@83['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@128['AbstractStringBuilder'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@114['AbstractStringBuilder']
+    classifier = JavaClassImpl@87['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@130['AbstractStringBuilder'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@99['AbstractStringBuilder']
+    classifier = JavaClassImpl@108['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@132['AbstractStringBuilder'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@83['AbstractStringBuilder']
+    classifier = JavaClassImpl@111['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@134['AbstractStringBuilder'] {
     arguments = ArrayList@135[empty]
     classifier = JavaClassImpl@105['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@136['AbstractStringBuilder'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@117['AbstractStringBuilder']
+    classifier = JavaClassImpl@99['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@138['AbstractStringBuilder'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@120['AbstractStringBuilder']
+    classifier = JavaClassImpl@96['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@140['AbstractStringBuilder'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@102['AbstractStringBuilder']
+    classifier = JavaClassImpl@117['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@142['AbstractStringBuilder'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@108['AbstractStringBuilder']
+    classifier = JavaClassImpl@102['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@144['AbstractStringBuilder'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@90['AbstractStringBuilder']
+    classifier = JavaClassImpl@114['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@146['AbstractStringBuilder'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@87['AbstractStringBuilder']
+    classifier = JavaClassImpl@90['AbstractStringBuilder']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@71['AbstractStringBuilder'] {
     arguments = ArrayList@148[empty]
     classifier = JavaClassImpl@149['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@62['Appendable'] {
     arguments = ArrayList@150[empty]
     classifier = JavaClassImpl@151['Appendable']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+    memberScope = LazyJavaClassMemberScope@23
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@152['Appendable'] {
     arguments = ArrayList@153[empty]
     classifier = JavaClassImpl@154['Appendable']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@155['Appendable'] {
     arguments = ArrayList@156[empty]
     classifier = JavaClassImpl@157['Appendable']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@158['Appendable'] {
     arguments = ArrayList@159[empty]
     classifier = JavaClassImpl@160['Appendable']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@161['Appendable'] {
     arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@157['Appendable']
+    classifier = JavaClassImpl@160['Appendable']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@163['Appendable'] {
     arguments = ArrayList@164[empty]
-    classifier = JavaClassImpl@160['Appendable']
+    classifier = JavaClassImpl@154['Appendable']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@165['Appendable'] {
     arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@154['Appendable']
+    classifier = JavaClassImpl@157['Appendable']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Appendable']
 }
 
 LazyJavaClassifierType@63['CharSequence'] {
@@ -390,49 +382,49 @@ LazyJavaClassifierType@191['CharSequence'] {
 
 LazyJavaClassifierType@194['CharSequence'] {
     arguments = ArrayList@195[empty]
-    classifier = JavaClassImpl@193['CharSequence']
+    classifier = JavaClassImpl@190['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@196['CharSequence'] {
     arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@175['CharSequence']
+    classifier = JavaClassImpl@187['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@198['CharSequence'] {
     arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@181['CharSequence']
+    classifier = JavaClassImpl@184['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@200['CharSequence'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@178['CharSequence']
+    classifier = JavaClassImpl@175['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@202['CharSequence'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@187['CharSequence']
+    classifier = JavaClassImpl@181['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@204['CharSequence'] {
     arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@184['CharSequence']
+    classifier = JavaClassImpl@193['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
 
 LazyJavaClassifierType@206['CharSequence'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@190['CharSequence']
+    classifier = JavaClassImpl@178['CharSequence']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@170
 }
@@ -458,14 +450,14 @@ LazyJavaClassifierType@213['Object'] {
 
 LazyJavaClassifierType@216['Object'] {
     arguments = ArrayList@217[empty]
-    classifier = JavaClassImpl@215['Object']
+    classifier = JavaClassImpl@211['Object']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@212
 }
 
 LazyJavaClassifierType@218['Object'] {
     arguments = ArrayList@219[empty]
-    classifier = JavaClassImpl@211['Object']
+    classifier = JavaClassImpl@215['Object']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@212
 }
@@ -488,13 +480,13 @@ LazyJavaClassifierType@224['Object'] {
 LazyJavaClassifierType@77['Serializable'] {
     arguments = ArrayList@226[empty]
     classifier = JavaClassImpl@227['Serializable']
-    memberScope = LazyJavaClassMemberScope@35
-    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
+    memberScope = LazyJavaClassMemberScope@33
+    typeConstructor = LazyJavaClassTypeConstructor@37['Serializable']
 }
 
 LazyJavaClassifierType@72['Serializable'] {
     classifier = JavaClassImpl@228['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@37['Serializable']
 }
 
 LazyJavaClassifierType@229['String'] {
@@ -541,21 +533,21 @@ LazyJavaClassifierType@245['String'] {
 
 LazyJavaClassifierType@247['String'] {
     arguments = ArrayList@248[empty]
-    classifier = JavaClassImpl@235['String']
+    classifier = JavaClassImpl@238['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
 
 LazyJavaClassifierType@249['String'] {
     arguments = ArrayList@250[empty]
-    classifier = JavaClassImpl@238['String']
+    classifier = JavaClassImpl@241['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
 
 LazyJavaClassifierType@251['String'] {
     arguments = ArrayList@252[empty]
-    classifier = JavaClassImpl@241['String']
+    classifier = JavaClassImpl@235['String']
     nullable = 'true': Boolean@123
     typeConstructor = DeserializedClassTypeConstructor@232
 }
@@ -571,28 +563,28 @@ LazyJavaClassifierType@255['StringBuffer'] {
     arguments = ArrayList@256[empty]
     classifier = JavaClassImpl@257['StringBuffer']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
 }
 
 LazyJavaClassifierType@258['StringBuffer'] {
     arguments = ArrayList@259[empty]
     classifier = JavaClassImpl@260['StringBuffer']
     nullable = 'false': Boolean@84
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
 }
 
 LazyJavaClassifierType@261['StringBuffer'] {
     arguments = ArrayList@262[empty]
-    classifier = JavaClassImpl@260['StringBuffer']
+    classifier = JavaClassImpl@257['StringBuffer']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
 }
 
 LazyJavaClassifierType@263['StringBuffer'] {
     arguments = ArrayList@264[empty]
-    classifier = JavaClassImpl@257['StringBuffer']
+    classifier = JavaClassImpl@260['StringBuffer']
     nullable = 'true': Boolean@123
-    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@39['StringBuffer']
 }
 
 LazyJavaClassifierType@265['StringBuilder'] {
@@ -702,105 +694,105 @@ LazyJavaClassifierType@307['StringBuilder'] {
 
 LazyJavaClassifierType@310['StringBuilder'] {
     arguments = ArrayList@311[empty]
-    classifier = JavaClassImpl@279['StringBuilder']
+    classifier = JavaClassImpl@303['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@312['StringBuilder'] {
     arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@303['StringBuilder']
+    classifier = JavaClassImpl@300['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@314['StringBuilder'] {
     arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@270['StringBuilder']
+    classifier = JavaClassImpl@306['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@316['StringBuilder'] {
     arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@309['StringBuilder']
+    classifier = JavaClassImpl@288['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@318['StringBuilder'] {
     arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@291['StringBuilder']
+    classifier = JavaClassImpl@282['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@320['StringBuilder'] {
     arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@306['StringBuilder']
+    classifier = JavaClassImpl@276['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@322['StringBuilder'] {
     arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@294['StringBuilder']
+    classifier = JavaClassImpl@285['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@324['StringBuilder'] {
     arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@297['StringBuilder']
+    classifier = JavaClassImpl@309['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@326['StringBuilder'] {
     arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@288['StringBuilder']
+    classifier = JavaClassImpl@267['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@328['StringBuilder'] {
     arguments = ArrayList@329[empty]
-    classifier = JavaClassImpl@267['StringBuilder']
+    classifier = JavaClassImpl@273['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@330['StringBuilder'] {
     arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@276['StringBuilder']
+    classifier = JavaClassImpl@279['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@332['StringBuilder'] {
     arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@300['StringBuilder']
+    classifier = JavaClassImpl@291['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@334['StringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@282['StringBuilder']
+    classifier = JavaClassImpl@297['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@336['StringBuilder'] {
     arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@285['StringBuilder']
+    classifier = JavaClassImpl@270['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
 
 LazyJavaClassifierType@338['StringBuilder'] {
     arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@273['StringBuilder']
+    classifier = JavaClassImpl@294['StringBuilder']
     nullable = 'true': Boolean@123
     typeConstructor = LazyJavaClassTypeConstructor@59['StringBuilder']
 }
@@ -829,10 +821,10 @@ LazyJavaPackageFragmentProvider@340 {
     packageFragments('kotlin.io': FqName@365) = null
     packageFragments('kotlin.jvm': FqName@366) = null
     topLevelClasses(JavaClassImpl@80['AbstractStringBuilder']) = LazyJavaClassDescriptor@2['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@151['Appendable']) = LazyJavaClassDescriptor@19['Appendable']
-    topLevelClasses(JavaClassImpl@227['Serializable']) = LazyJavaClassDescriptor@33['Serializable']
-    topLevelClasses(JavaClassImpl@257['StringBuffer']) = LazyJavaClassDescriptor@40['StringBuffer']
-    topLevelClasses(JavaClassImpl@367['StringBuilder']) = LazyJavaClassDescriptor@42['StringBuilder']
+    topLevelClasses(JavaClassImpl@151['Appendable']) = LazyJavaClassDescriptor@16['Appendable']
+    topLevelClasses(JavaClassImpl@227['Serializable']) = LazyJavaClassDescriptor@30['Serializable']
+    topLevelClasses(JavaClassImpl@257['StringBuffer']) = LazyJavaClassDescriptor@38['StringBuffer']
+    topLevelClasses(JavaClassImpl@367['StringBuilder']) = LazyJavaClassDescriptor@40['StringBuilder']
 }
 
 LazyJavaPackageFragment@342['<root>'] {
@@ -841,57 +833,1157 @@ LazyJavaPackageFragment@342['<root>'] {
     classes('Int': Name@371) = null // through LazyPackageFragmentScopeForJavaPackage@369
     classes('String': Name@372) = null // through LazyPackageFragmentScopeForJavaPackage@369
     classes('StringBuilder': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('append': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@369
     classes('array1': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('hasNext': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('iterator': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('join': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('joinG': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('joinT': Name@379) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('next': Name@380) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    classes('toString': Name@381) = null // through LazyPackageFragmentScopeForJavaPackage@369
-    deserializedPackageScope = Empty@382 // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('StringBuilder': Name@373) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('append': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('array1': Name@374) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('hasNext': Name@375) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('iterator': Name@376) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('join': Name@377) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('joinG': Name@378) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('joinT': Name@379) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('next': Name@380) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    functions('toString': Name@381) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@369
-    memberIndex = computeMemberIndex$1@383 // through LazyPackageFragmentScopeForJavaPackage@369
+    classes('join': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@369
+    classes('joinG': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@369
+    classes('joinT': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@369
+    deserializedPackageScope = Empty@378 // through LazyPackageFragmentScopeForJavaPackage@369
+    functions('StringBuilder': Name@373) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
+    functions('array1': Name@374) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
+    functions('join': Name@375) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
+    functions('joinG': Name@376) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
+    functions('joinT': Name@377) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@369
+    memberIndex = computeMemberIndex$1@379 // through LazyPackageFragmentScopeForJavaPackage@369
 }
 
 LazyJavaPackageFragment@349['java'] {
-    classes('lang': Name@384) = null // through LazyPackageFragmentScopeForJavaPackage@385
-    deserializedPackageScope = Empty@382 // through LazyPackageFragmentScopeForJavaPackage@385
-    functions('lang': Name@386) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@385
-    memberIndex = computeMemberIndex$1@387 // through LazyPackageFragmentScopeForJavaPackage@385
+    classes('lang': Name@380) = null // through LazyPackageFragmentScopeForJavaPackage@381
+    deserializedPackageScope = Empty@378 // through LazyPackageFragmentScopeForJavaPackage@381
+    functions('lang': Name@382) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@381
+    memberIndex = computeMemberIndex$1@383 // through LazyPackageFragmentScopeForJavaPackage@381
 }
 
 LazyJavaPackageFragment@353['lang'] {
-    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@42['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('append': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('array1': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('hasNext': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('iterator': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('join': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('joinG': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('joinT': Name@379) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('next': Name@380) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    classes('toString': Name@381) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    deserializedPackageScope = Empty@382 // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('StringBuilder': Name@373) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('append': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('array1': Name@374) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('hasNext': Name@375) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('iterator': Name@376) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('join': Name@377) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('joinG': Name@378) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('joinT': Name@379) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('next': Name@380) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('toString': Name@381) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    memberIndex = computeMemberIndex$1@389 // through LazyPackageFragmentScopeForJavaPackage@388
+    classes('StringBuilder': Name@373) = LazyJavaClassDescriptor@40['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@384
+    classes('array1': Name@374) = null // through LazyPackageFragmentScopeForJavaPackage@384
+    classes('join': Name@375) = null // through LazyPackageFragmentScopeForJavaPackage@384
+    classes('joinG': Name@376) = null // through LazyPackageFragmentScopeForJavaPackage@384
+    classes('joinT': Name@377) = null // through LazyPackageFragmentScopeForJavaPackage@384
+    deserializedPackageScope = Empty@378 // through LazyPackageFragmentScopeForJavaPackage@384
+    functions('StringBuilder': Name@373) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
+    functions('array1': Name@374) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
+    functions('join': Name@375) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
+    functions('joinG': Name@376) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
+    functions('joinT': Name@377) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@384
+    memberIndex = computeMemberIndex$1@385 // through LazyPackageFragmentScopeForJavaPackage@384
+}
+
+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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@404 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@416 {
+    <name not found> = ArrayList@417[1] { ResolutionCandidate@418 }
+    <name not found> = ArrayList@419[1] { ResolutionCandidate@418 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@428 {
+    <name not found> = ArrayList@429[1] { ResolutionCandidate@430 }
+    <name not found> = ArrayList@431[1] { ResolutionCandidate@430 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@440 {
+    <name not found> = ArrayList@441[1] { ResolutionCandidate@442 }
+    <name not found> = ArrayList@443[1] { ResolutionCandidate@442 }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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@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@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@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@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@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@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@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@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[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[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@776 {
+    <name not found> = ArrayList@777[1] { ResolutionCandidate@778 }
+    <name not found> = ArrayList@779[1] { ResolutionCandidate@778 }
+}
+
+ResolutionTaskHolder@780 {
+    <name not found> = ArrayList@781[1] { ResolutionCandidate@782 }
+    <name not found> = ArrayList@783[1] { ResolutionCandidate@782 }
+}
+
+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, ... }
+    <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 57c39c40e0b..89291f80f27 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/booleanExpressions.lazy.log
@@ -24,3 +24,43 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@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@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@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 }
+}
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 5efef0a79ef..e7e7b1ad8f1 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1897_diagnostic_part.lazy.log
@@ -37,3 +37,318 @@ LazyJavaPackageFragment@12['lang'] {
     functions('xx': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 8f344050427..6e2d35e4b1a 100644
--- a/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkArguments/kt1940.lazy.log
@@ -25,3 +25,49 @@ LazyJavaPackageFragment@7['lang'] {
     functions('foo': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 c975207f91b..0d67640df14 100644
--- a/compiler/testData/diagnostics/tests/checkType.lazy.log
+++ b/compiler/testData/diagnostics/tests/checkType.lazy.log
@@ -60,3 +60,65 @@ LazyJavaPackageFragment@14['lang'] {
     functions('checkType': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@43[empty]
+    <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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
index 252dbe41762..b2ab4888563 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectCannotAccessClassFields.lazy.log
@@ -31,3 +31,66 @@ LazyJavaPackageFragment@11['lang'] {
     classes('x': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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@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> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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 e8bb6d780fb..5fadb379693 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjectVisibility.lazy.log
@@ -37,3 +37,134 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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> = 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]
+    <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@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]
+    <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]
+}
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <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 }
+    <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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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/classObjects/ClassObjects.lazy.log b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
index 489fd662acd..59e825f0d55 100644
--- a/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/ClassObjects.lazy.log
@@ -17,46 +17,40 @@ DescriptorResolver@0 {
 LazyJavaClassDescriptor@10['Appendable'] {
     functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@13
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Appendable']
 }
 
-LazyJavaClassDescriptor@17['AutoCloseable'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
+LazyJavaClassDescriptor@16['AutoCloseable'] {
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@21['Closeable'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
+LazyJavaClassDescriptor@20['Closeable'] {
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
 }
 
-LazyJavaClassDescriptor@25['FilterOutputStream'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['FilterOutputStream']
+LazyJavaClassDescriptor@24['FilterOutputStream'] {
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@25
+    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@25
+    typeConstructor = LazyJavaClassTypeConstructor@27['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@29['OutputStream'] {
-    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@30
-    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@30
-    typeConstructor = LazyJavaClassTypeConstructor@32['OutputStream']
+LazyJavaClassDescriptor@28['OutputStream'] {
+    functions('println': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@29
+    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@29
+    typeConstructor = LazyJavaClassTypeConstructor@31['OutputStream']
 }
 
-LazyJavaClassDescriptor@33['PrintStream'] {
-    defaultType = JetTypeImpl@34['PrintStream']
-    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@36
-    functions('println': Name@15) = ArrayList@37[10] { JavaMethodDescriptor@38['println'], JavaMethodDescriptor@39['println'], JavaMethodDescriptor@40['println'], ... } // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@36
-    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@36
-    nestedClasses('println': Name@15) = null // through LazyJavaClassMemberScope@36
-    properties('println': Name@15) = EmptyList@12[empty] // through LazyJavaClassMemberScope@36
+LazyJavaClassDescriptor@32['PrintStream'] {
+    defaultType = JetTypeImpl@33['PrintStream']
+    enumEntryIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@35
+    functions('println': Name@36) = ArrayList@37[10] { JavaMethodDescriptor@38['println'], JavaMethodDescriptor@39['println'], JavaMethodDescriptor@40['println'], ... } // through LazyJavaClassMemberScope@35
+    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@35
+    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@35
+    nestedClasses('println': Name@36) = null // through LazyJavaClassMemberScope@35
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@43['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
 }
@@ -72,27 +66,27 @@ LazyJavaClassDescriptor@45['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@55['System']
 }
 
-LazyJavaClassTypeConstructor@16['Appendable'] {
+LazyJavaClassTypeConstructor@15['Appendable'] {
     parameters = ArrayList@56[empty]
     supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@20['AutoCloseable'] {
+LazyJavaClassTypeConstructor@19['AutoCloseable'] {
     parameters = ArrayList@59[empty]
     supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@24['Closeable'] {
+LazyJavaClassTypeConstructor@23['Closeable'] {
     parameters = ArrayList@61[empty]
     supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@28['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@27['FilterOutputStream'] {
     parameters = ArrayList@64[empty]
     supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@32['OutputStream'] {
+LazyJavaClassTypeConstructor@31['OutputStream'] {
     parameters = ArrayList@67[empty]
     supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['Closeable'] }
 }
@@ -110,35 +104,35 @@ LazyJavaClassifierType@73['Appendable'] {
     arguments = ArrayList@76[empty]
     classifier = JavaClassImpl@77['Appendable']
     memberScope = LazyJavaClassMemberScope@13
-    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Appendable']
 }
 
 LazyJavaClassifierType@63['AutoCloseable'] {
     arguments = ArrayList@78[empty]
     classifier = JavaClassImpl@79['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['AutoCloseable']
 }
 
 LazyJavaClassifierType@69['Closeable'] {
     arguments = ArrayList@80[empty]
     classifier = JavaClassImpl@81['Closeable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
 }
 
 LazyJavaClassifierType@74['Closeable'] {
     arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Closeable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['Closeable']
 }
 
 LazyJavaClassifierType@72['FilterOutputStream'] {
     arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@26
-    typeConstructor = LazyJavaClassTypeConstructor@28['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@25
+    typeConstructor = LazyJavaClassTypeConstructor@27['FilterOutputStream']
 }
 
 LazyJavaClassifierType@86['Flushable'] {
@@ -183,14 +177,14 @@ LazyJavaClassifierType@102['Object'] {
 LazyJavaClassifierType@66['OutputStream'] {
     arguments = ArrayList@104[empty]
     classifier = JavaClassImpl@105['OutputStream']
-    memberScope = LazyJavaClassMemberScope@30
-    typeConstructor = LazyJavaClassTypeConstructor@32['OutputStream']
+    memberScope = LazyJavaClassMemberScope@29
+    typeConstructor = LazyJavaClassTypeConstructor@31['OutputStream']
 }
 
 LazyJavaClassifierType@106['PrintStream'] {
     arguments = ArrayList@107[empty]
     classifier = JavaClassImpl@108['PrintStream']
-    memberScope = LazyJavaClassMemberScope@36
+    memberScope = LazyJavaClassMemberScope@35
     nullable = 'false': Boolean@91
     typeConstructor = LazyJavaClassTypeConstructor@44['PrintStream']
 }
@@ -247,11 +241,11 @@ LazyJavaPackageFragmentProvider@117 {
     packageFragments('kotlin.io': FqName@149) = null
     packageFragments('kotlin.jvm': FqName@150) = null
     topLevelClasses(JavaClassImpl@77['Appendable']) = LazyJavaClassDescriptor@10['Appendable']
-    topLevelClasses(JavaClassImpl@79['AutoCloseable']) = LazyJavaClassDescriptor@17['AutoCloseable']
-    topLevelClasses(JavaClassImpl@83['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
-    topLevelClasses(JavaClassImpl@85['FilterOutputStream']) = LazyJavaClassDescriptor@25['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@105['OutputStream']) = LazyJavaClassDescriptor@29['OutputStream']
-    topLevelClasses(JavaClassImpl@108['PrintStream']) = LazyJavaClassDescriptor@33['PrintStream']
+    topLevelClasses(JavaClassImpl@79['AutoCloseable']) = LazyJavaClassDescriptor@16['AutoCloseable']
+    topLevelClasses(JavaClassImpl@83['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']
     topLevelClasses(JavaClassImpl@151['System']) = LazyJavaClassDescriptor@45['System']
 }
 
@@ -265,10 +259,250 @@ LazyJavaPackageFragment@135['java'] {
 LazyJavaPackageFragment@139['lang'] {
     classes('System': Name@157) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@158
     classes('java': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('println': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@158
     classes('x': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@158
     deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('println': Name@15) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@158
     functions('x': Name@160) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@158
     memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@158
 }
+
+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@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+    <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@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <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 }
+    <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 }
+    <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]
+}
+
+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]
+    <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 {
+    <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@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]
+    <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 {
+    <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 ba57aba258b..4851e11c78b 100644
--- a/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/importClassInClassObject.lazy.log
@@ -26,3 +26,12 @@ LazyJavaPackageFragment@10['lang'] {
     functions('B': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
index 851de6ea8c9..09af2f73fd9 100644
--- a/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/invisibleClassObjects.lazy.log
@@ -46,13 +46,423 @@ LazyJavaPackageFragment@23['lang'] {
     classes('bar': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('baz': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('f': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('foo': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('quux': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('quux': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
     deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
     functions('bar': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     functions('baz': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     functions('f': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('foo': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('quux': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('quux': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@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]
+    <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]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@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]
+}
+
+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]
+    <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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 1568eb18b95..007b4d03a9f 100644
--- a/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/kt3866.lazy.log
@@ -15,26 +15,142 @@ LazyJavaPackageFragmentProvider@0 {
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('compareTo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('compareTo': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('compareTo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('compareTo': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+    <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]
+    <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]
+    <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]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+    <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> = 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]
+    <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]
+    <name not found> = EmptyList@20[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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 554e0c9ea12..6eaa6facf38 100644
--- a/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/classObjects/nestedClassInPrivateClassObject.lazy.log
@@ -35,3 +35,164 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@16) = 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> = 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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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@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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <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@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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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@48 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 69d5e8cf22e..ef6d5b42d19 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.lazy.log
@@ -103,52 +103,1625 @@ LazyJavaPackageFragment@34['lang'] {
     classes('a': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('b': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('c': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('compareTo': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('dec': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('doSmth': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('hasNext': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('i': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('inc': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('iterator': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('j': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('k': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('l': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('m': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('minus': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('minusAssign': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('n': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('next': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('o': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('p': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('plus': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('plusAssign': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('rangeTo': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('signal': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('times': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('timesAssign': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('x': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('y': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('yy': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('z': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('doSmth': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('i': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('j': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('k': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('l': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('m': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('minusAssign': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('n': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('o': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('p': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('plusAssign': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('timesAssign': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('x': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('y': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('yy': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('z': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@80
     deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('$b': Name@113) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('$b': Name@101) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     functions('A': Name@81) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('compareTo': Name@85) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('dec': Name@86) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('doSmth': Name@87) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('equals': Name@88) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('hasNext': Name@89) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('inc': Name@91) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('iterator': Name@92) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('minus': Name@97) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('minusAssign': Name@98) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('next': Name@100) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('plus': Name@103) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('plusAssign': Name@104) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('rangeTo': Name@105) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('signal': Name@106) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('times': Name@107) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('timesAssign': Name@108) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('doSmth': Name@85) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('minusAssign': Name@91) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('plusAssign': Name@95) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('timesAssign': Name@96) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@80
+}
+
+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> = 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 }
+    <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> = 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 }
+    <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> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@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 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@163 }
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@163 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@173 {
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@175 }
+    <name not found> = ArrayList@176[1] { ResolutionCandidate@175 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@199 }
+    <name not found> = ArrayList@200[1] { ResolutionCandidate@199 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@209 {
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@211 }
+    <name not found> = ArrayList@212[1] { ResolutionCandidate@211 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@221 {
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@223 }
+    <name not found> = ArrayList@224[1] { ResolutionCandidate@223 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@235 }
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@235 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@245 {
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@247 }
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@247 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@257 {
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@259 }
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@259 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <name not found> = EmptyList@77[empty]
+}
+
+ResolutionTaskHolder@269 {
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@271 }
+    <name not found> = ArrayList@272[1] { ResolutionCandidate@271 }
+    <name not found> = EmptyList@77[empty]
+    <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]
+    <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@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@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@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@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@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@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@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@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@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@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 }
+}
+
+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[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 }
+}
+
+ResolutionTaskHolder@517 {
+    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
+    <name not found> = ArrayList@520[1] { ResolutionCandidate@519 }
+}
+
+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@529 {
+    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@531 }
+}
+
+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@541 {
+    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
+    <name not found> = ArrayList@544[1] { ResolutionCandidate@543 }
+}
+
+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@553 {
+    <name not found> = ArrayList@554[1] { ResolutionCandidate@555 }
+    <name not found> = ArrayList@556[1] { ResolutionCandidate@555 }
+}
+
+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@565 {
+    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
+    <name not found> = ArrayList@568[1] { ResolutionCandidate@567 }
+}
+
+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@577 {
+    <name not found> = ArrayList@578[1] { ResolutionCandidate@579 }
+    <name not found> = ArrayList@580[1] { ResolutionCandidate@579 }
+}
+
+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@589 {
+    <name not found> = ArrayList@590[1] { ResolutionCandidate@591 }
+    <name not found> = ArrayList@592[1] { ResolutionCandidate@591 }
+}
+
+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@601 {
+    <name not found> = ArrayList@602[1] { ResolutionCandidate@603 }
+    <name not found> = ArrayList@604[1] { ResolutionCandidate@603 }
+}
+
+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@613 {
+    <name not found> = ArrayList@614[1] { ResolutionCandidate@615 }
+    <name not found> = ArrayList@616[1] { ResolutionCandidate@615 }
+}
+
+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@625 {
+    <name not found> = ArrayList@626[1] { ResolutionCandidate@627 }
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@627 }
+}
+
+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@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]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@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]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@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]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@656 {
+    <name not found> = ArrayList@657[2] { ResolutionCandidate@658, ResolutionCandidate@659 }
+    <name not found> = ArrayList@660[2] { ResolutionCandidate@658, ResolutionCandidate@659 }
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@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]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@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]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@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]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <name not found> = EmptyList@77[empty]
+    <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@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 353f8edff3b..193a9124a53 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.lazy.log
@@ -226,9 +226,80 @@ LazyJavaTypeParameterDescriptor@19['E'] {
 }
 
 LazyJavaTypeParameterResolver@134 {
-    resolve(JavaTypeParameterImpl@135['E']) = LazyJavaTypeParameterDescriptor@24['E']
+    resolve(JavaTypeParameterImpl@135['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
 LazyJavaTypeParameterResolver@136 {
-    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@24['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> = EmptyList@118[empty]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@145 {
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@147 }
+    <name not found> = ArrayList@148[1] { ResolutionCandidate@147 }
+    <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]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = EmptyList@118[empty]
+    <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]
+    <name not found> = EmptyList@118[empty]
+}
+
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+    <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]
+    <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 0320acf93b5..890495a607e 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/breakOrContinueInLoopCondition.lazy.log
@@ -12,42 +12,141 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('hasNext': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('iterator': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('next': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('rangeTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('hasNext': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('inc': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('iterator': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('next': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('rangeTo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('hasNext': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('iterator': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('next': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('rangeTo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('hasNext': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('inc': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('iterator': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('next': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('rangeTo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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@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@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 }
+}
+
+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 }
+}
+
+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> = 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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
index b5eab31ff16..f4fb9f8abb8 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkInnerLocalDeclarations.lazy.log
@@ -14,3 +14,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
     memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
 }
+
+ResolutionTaskHolder@17 {
+    <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
+    <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 6e738b8b618..8e65e12aaeb 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/checkPropertyAccessor.lazy.log
@@ -21,6 +21,22 @@ LazyJavaPackageFragment@9['java'] {
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commasAndWhitespaces.lazy.log
index 80fa8235c66..6b72c907bf5 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@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
 }
@@ -79,7 +79,7 @@ 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
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -154,3 +154,26 @@ LazyJavaPackageFragment@58['lang'] {
     functions('todo': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
+
+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@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, ... }
+    <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/commentsInDeadCode.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
index ea1643e58b2..7f34721a25d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/commentsInDeadCode.lazy.log
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 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@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -144,3 +144,66 @@ LazyJavaPackageFragment@62['lang'] {
     functions('todo': Name@82) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
 }
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <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, ... }
+    <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 7de5eebba69..2577934a2cc 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInInvokeCall.lazy.log
@@ -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@39['Throwable']
+    classifier = JavaClassImpl@35['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
@@ -152,3 +152,49 @@ LazyJavaPackageFragment@59['lang'] {
     functions('todo': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
+
+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]
+    <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 }
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <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, ... }
+    <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 c6f05f4339b..fac81e682cc 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCallInReceiver.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@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@20['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
 }
@@ -150,3 +150,48 @@ LazyJavaPackageFragment@57['lang'] {
     functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
 }
+
+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]
+    <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 }
+    <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@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[4] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <name not found> = ArrayList@102[5] { ResolutionCandidate@99, ResolutionCandidate@100, ResolutionCandidate@101, ... }
+    <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 e31db7aded8..174bb4451f7 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeDifferentExamples.lazy.log
@@ -52,7 +52,7 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -66,7 +66,7 @@ LazyJavaClassifierType@34['String'] {
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -94,7 +94,7 @@ LazyJavaClassifierType@45['Throwable'] {
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@44['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -108,7 +108,7 @@ LazyJavaClassifierType@50['Throwable'] {
 
 LazyJavaClassifierType@52['Throwable'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@44['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@41
 }
@@ -151,50 +151,217 @@ LazyJavaPackageFragment@58['<root>'] {
     classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('Nothing': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@83
     classes('Unit': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('compareTo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('equals': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('fail': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('hasNext': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('iterator': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('java': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('next': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('rangeTo': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('compareTo': Name@88) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('equals': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('fail': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('hasNext': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('iterator': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('next': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('rangeTo': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('fail': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('java': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('equals': Name@88) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('fail': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('lang': Name@96) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@67['lang'] {
-    classes('RuntimeException': Name@103) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('compareTo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('equals': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('fail': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('hasNext': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('iterator': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('java': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('next': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('rangeTo': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('RuntimeException': Name@103) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('compareTo': Name@88) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('equals': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('fail': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('hasNext': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('iterator': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('next': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('rangeTo': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('RuntimeException': Name@98) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('equals': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('fail': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('java': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('RuntimeException': Name@98) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('equals': Name@88) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('fail': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
+}
+
+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@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]
+    <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@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 }
+}
+
+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[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]
+}
+
+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@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@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@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@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]
+    <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@241 {
+    <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/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
index 0f120026941..99148f43037 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeFromDifferentSources.lazy.log
@@ -37,21 +37,21 @@ 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@20['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
 }
@@ -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
 }
@@ -133,10 +133,77 @@ LazyJavaPackageFragment@58['java'] {
 LazyJavaPackageFragment@60['lang'] {
     classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@76
     classes('bar': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plus': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
     deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@76
     functions('Exception': Name@75) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     functions('bar': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plus': Name@78) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
+}
+
+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]
+    <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@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 }
+}
+
+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]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <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/deadCodeInArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInArrayAccess.lazy.log
index e37dedba2f9..a14666ed4a4 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@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,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
 }
@@ -174,3 +174,221 @@ LazyJavaPackageFragment@60['lang'] {
     functions('todo': Name@86) = EmptyList@88[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
+
+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]
+    <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]
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@88[empty]
+    <name not found> = EmptyList@88[empty]
+}
+
+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@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@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 }
+}
+
+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, ... }
+    <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 c47bd3c1561..5f0f5002a8d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInAssignment.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,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
 }
@@ -120,33 +120,98 @@ LazyJavaPackageFragmentProvider@49 {
 LazyJavaPackageFragment@51['<root>'] {
     classes('Exception': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('Int': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('plus': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('plusAssign': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('todo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('Exception': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('plus': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('plusAssign': Name@67) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('todo': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('plusAssign': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('Exception': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('plusAssign': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('lang': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('Exception': Name@63) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plus': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('plusAssign': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('todo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('Exception': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plus': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('plusAssign': Name@67) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('todo': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('Exception': Name@63) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('plusAssign': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('todo': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('Exception': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('plusAssign': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+}
+
+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]
+    <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]
+    <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@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[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <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 15be71c3e2c..6b9f80337fd 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInBinaryExpressions.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@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
 }
@@ -129,36 +129,152 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('String': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('plus': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('Exception': Name@71) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('bar': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('plus': Name@75) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('times': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('todo': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('times': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('todo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('bar': Name@74) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('times': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('todo': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@56['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('lang': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@58['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('plus': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('times': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('todo': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('Exception': Name@71) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('bar': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('plus': Name@75) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('times': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('todo': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('bar': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('times': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('todo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('bar': Name@74) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('times': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('todo': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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[4] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = ArrayList@151[5] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <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 20adaa72c16..b12cad2a64d 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@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
 }
@@ -79,21 +79,21 @@ 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@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@33['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -134,35 +134,75 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Unit': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('invoke': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('todo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@74) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('bar': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('f': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('invoke': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('todo': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('bar': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('f': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('todo': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('invoke': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('todo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@74) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('bar': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('f': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('invoke': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('todo': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('bar': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('f': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('todo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('Exception': Name@74) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('bar': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('f': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('todo': 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> = 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]
+    <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]
+    <name not found> = EmptyList@82[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[4] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <name not found> = ArrayList@115[5] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <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 c4ab8e73a8a..547abb9cf0c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInDeadCode.lazy.log
@@ -37,7 +37,7 @@ 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
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 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
 }
@@ -125,32 +125,92 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Array': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('Exception': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('get': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Exception': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('get': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@69) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('get': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Exception': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('get': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Exception': Name@69) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('bar': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('todo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('bar': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('todo': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
+}
+
+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]
+    <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 }
+    <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@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]
+    <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, ... }
+    <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 df82227b653..f8dfe531985 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInIf.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
 }
@@ -79,21 +79,21 @@ 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@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
 }
@@ -146,3 +146,54 @@ LazyJavaPackageFragment@56['lang'] {
     functions('todo': Name@67) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
+
+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]
+    <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]
+    <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 }
+}
+
+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[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = ArrayList@106[5] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <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 774ab808e8b..db097a0afbc 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInInnerExpressions.lazy.log
@@ -37,14 +37,14 @@ 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@20['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -162,3 +162,79 @@ LazyJavaPackageFragment@59['lang'] {
     functions('todo': 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> = 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]
+    <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]
+    <name not found> = EmptyList@82[empty]
+    <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@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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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@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@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 af285a22a71..95f67b9a600 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@33['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@33['String']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@27
 }
@@ -103,14 +103,14 @@ LazyJavaClassifierType@48['Throwable'] {
 
 LazyJavaClassifierType@51['Throwable'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@50['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
 
 LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@50['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@36
     typeConstructor = DeserializedClassTypeConstructor@44
 }
@@ -177,3 +177,100 @@ LazyJavaPackageFragment@68['lang'] {
     functions('todo': Name@84) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@92
 }
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <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 }
+    <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@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[4] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <name not found> = ArrayList@147[5] { ResolutionCandidate@144, ResolutionCandidate@145, ResolutionCandidate@146, ... }
+    <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 6e13b815fe9..49f6cca8328 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInLoops.lazy.log
@@ -122,44 +122,106 @@ LazyJavaPackageFragment@52['<root>'] {
     classes('Exception': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
     classes('Nothing': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
     classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('iterator': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('rangeTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('Exception': Name@64) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('bar': Name@67) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('hasNext': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('iterator': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('next': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('rangeTo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('iterator': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('todo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('Exception': Name@64) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('bar': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('iterator': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('todo': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('lang': Name@75) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('Exception': Name@64) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('iterator': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('rangeTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('todo': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('Exception': Name@64) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('bar': Name@67) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('hasNext': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('iterator': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('next': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('rangeTo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('Exception': Name@64) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('bar': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('iterator': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('todo': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('Exception': Name@64) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('bar': Name@67) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('iterator': Name@68) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('todo': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+}
+
+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]
+    <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 }
+    <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@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@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 {
+    <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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
index cdec8bbb7dd..f67832ebf63 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInReturn.lazy.log
@@ -37,7 +37,7 @@ 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
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['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@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
 }
@@ -138,3 +138,21 @@ LazyJavaPackageFragment@55['lang'] {
     functions('todo': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
+
+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, ... }
+    <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/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
index 34d769ff10a..d731832a7d2 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInUnaryExpr.lazy.log
@@ -44,14 +44,14 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['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@20['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@37['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
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@37['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -154,3 +154,58 @@ LazyJavaPackageFragment@57['lang'] {
     functions('todo': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
+
+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]
+    <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 }
+    <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@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]
+    <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, ... }
+    <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 9bad0efa572..2eab36a3e85 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/deadCodeInWhileFromBreak.lazy.log
@@ -21,37 +21,112 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('compareTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('set': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('compareTo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('get': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('set': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('bar': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    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
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('compareTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('foo': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('set': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('bar': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('compareTo': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('get': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('set': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('bar': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('bar': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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[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 }
+}
+
+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[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+    <name not found> = ArrayList@83[7] { ResolutionCandidate@80, ResolutionCandidate@81, ResolutionCandidate@82, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
index db206e86cda..3170d355f46 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/expressionInUnitLiteral.lazy.log
@@ -24,29 +24,46 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('run': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@8['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@10['lang'] {
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('run': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('run': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('run': 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@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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
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 3401714cc2f..d7ac67f6d5f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_1.lazy.log
@@ -48,21 +48,21 @@ LazyJavaClassifierType@26['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@32['String'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@28['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@28['String']
+    classifier = JavaClassImpl@20['String']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@22
 }
@@ -90,21 +90,21 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@45['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
 
 LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaClassImpl@45['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@31
     typeConstructor = DeserializedClassTypeConstructor@39
 }
@@ -155,3 +155,17 @@ LazyJavaPackageFragment@62['lang'] {
     functions('RuntimeException': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@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[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]
+    <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 deb30ae848a..d6a68f8de76 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_2.lazy.log
@@ -52,21 +52,21 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -159,3 +159,30 @@ LazyJavaPackageFragment@63['lang'] {
     functions('cond': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
+
+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]
+    <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, ... }
+    <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 495677f388b..9572bb9d2f4 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt2585_3.lazy.log
@@ -73,28 +73,28 @@ LazyJavaClassifierType@41['String'] {
 
 LazyJavaClassifierType@44['String'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@37['String']
+    classifier = JavaClassImpl@40['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@47['String'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@43['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@49['String'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@40['String']
+    classifier = JavaClassImpl@37['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@51['String'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@43['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -129,14 +129,14 @@ LazyJavaClassifierType@63['Throwable'] {
 
 LazyJavaClassifierType@65['Throwable'] {
     arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@59['Throwable']
+    classifier = JavaClassImpl@55['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
 
 LazyJavaClassifierType@67['Throwable'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@55['Throwable']
+    classifier = JavaClassImpl@59['Throwable']
     nullable = 'true': Boolean@46
     typeConstructor = DeserializedClassTypeConstructor@56
 }
@@ -187,3 +187,21 @@ LazyJavaPackageFragment@78['lang'] {
     functions('RuntimeException': Name@87) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
+
+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, ... }
+    <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/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
index 305bbef1a2b..70f0d709188 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt3162tryAsInitializer.lazy.log
@@ -44,3 +44,13 @@ LazyJavaPackageFragment@14['java'] {
 LazyJavaPackageFragment@16['lang'] {
     classes('Exception': Name@25) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
index c21dd18d76f..6ffae8fb1a8 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/deadCode/kt5200DeadCodeInLambdas.lazy.log
@@ -98,31 +98,86 @@ LazyJavaPackageFragment@43['<root>'] {
     classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@62
     classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@62
     classes('inline': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('NullPointerException': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('block': Name@65) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('doCall': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('invoke': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('NullPointerException': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('block': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('doCall': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('lang': Name@74) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('lang': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@50['lang'] {
-    classes('NullPointerException': Name@63) = LazyJavaClassDescriptor@8['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('invoke': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('NullPointerException': Name@63) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('block': Name@65) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('doCall': Name@66) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('invoke': Name@68) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('NullPointerException': Name@63) = LazyJavaClassDescriptor@8['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('block': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('doCall': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('NullPointerException': Name@63) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('block': Name@65) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('doCall': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+}
+
+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]
+    <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@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[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <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 2bb94bfdf42..1eb97165866 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt3444_ReturnFromLocalFunctions.lazy.log
@@ -35,3 +35,17 @@ LazyJavaPackageFragment@13['lang'] {
     functions('local': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
index 93021fb20c2..53bbe1bd165 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturn/kt4034.lazy.log
@@ -22,3 +22,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 1c3da012f4f..f24dd2009a0 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/definiteReturnInWhen.lazy.log
@@ -20,16 +20,31 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@29
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
index cb128451f29..51991a5343a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1001.lazy.log
@@ -46,13 +46,56 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     classes('Exception': Name@38) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@39
     classes('doSmth': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('hasNext': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('iterator': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('next': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
     deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
     functions('doSmth': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('hasNext': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('iterator': Name@42) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('next': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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@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[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 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
index 70477f9e255..ecba73c1c7d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1027.lazy.log
@@ -25,17 +25,108 @@ LazyJavaPackageFragment@6['java'] {
 
 LazyJavaPackageFragment@8['lang'] {
     classes('doSmth': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('hasNext': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('iterator': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('next': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plusAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('plusAssign': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
     functions('doSmth': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('hasNext': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('iterator': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('next': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@30) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plusAssign': Name@31) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('plusAssign': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+    <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]
+    <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@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 }
+}
+
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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 99e369843a3..a661fe0962e 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1066.lazy.log
@@ -32,22 +32,162 @@ LazyJavaPackageFragment@9['java'] {
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('contains': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('mod': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plusAssign': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('randomDigit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('toChar': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('plusAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('randomDigit': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
     deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('compareTo': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('contains': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('mod': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plusAssign': Name@37) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('randomDigit': Name@38) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('toChar': Name@39) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('plusAssign': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('randomDigit': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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@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> = 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 }
+}
+
+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> = 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> = 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 }
+}
+
+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 {
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 a23369701eb..f5ca464ab6c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1156.lazy.log
@@ -1,50 +1,44 @@
 LazyJavaClassDescriptor@0['Appendable'] {
     functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
-LazyJavaClassDescriptor@7['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+LazyJavaClassDescriptor@6['AutoCloseable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@11['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+LazyJavaClassDescriptor@10['Closeable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassDescriptor@15['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
+LazyJavaClassDescriptor@14['Exception'] {
+    typeConstructor = LazyJavaClassTypeConstructor@15['Exception']
 }
 
-LazyJavaClassDescriptor@17['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+LazyJavaClassDescriptor@16['FilterOutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@21['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+LazyJavaClassDescriptor@20['OutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
-LazyJavaClassDescriptor@25['PrintStream'] {
-    defaultType = JetTypeImpl@26['PrintStream']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
-    functions('println': Name@5) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@28
-    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@28
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@28
+LazyJavaClassDescriptor@24['PrintStream'] {
+    defaultType = JetTypeImpl@25['PrintStream']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
+    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
+    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -67,32 +61,32 @@ LazyJavaClassDescriptor@45['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@55['System']
 }
 
-LazyJavaClassTypeConstructor@6['Appendable'] {
+LazyJavaClassTypeConstructor@5['Appendable'] {
     parameters = ArrayList@56[empty]
     supertypes = ArrayList@57[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+LazyJavaClassTypeConstructor@9['AutoCloseable'] {
     parameters = ArrayList@59[empty]
     supertypes = ArrayList@60[1] { JetTypeImpl@58['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['Closeable'] {
+LazyJavaClassTypeConstructor@13['Closeable'] {
     parameters = ArrayList@61[empty]
     supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@16['Exception'] {
+LazyJavaClassTypeConstructor@15['Exception'] {
     parameters = ArrayList@64[empty]
     supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
     parameters = ArrayList@67[empty]
     supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@24['OutputStream'] {
+LazyJavaClassTypeConstructor@23['OutputStream'] {
     parameters = ArrayList@70[empty]
     supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Closeable'] }
 }
@@ -115,41 +109,41 @@ LazyJavaClassifierType@76['Appendable'] {
     arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Appendable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
 LazyJavaClassifierType@63['AutoCloseable'] {
     arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
 LazyJavaClassifierType@77['Closeable'] {
     arguments = ArrayList@86[empty]
     classifier = JavaClassImpl@87['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@72['Closeable'] {
     arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@80['Exception'] {
     arguments = ArrayList@90[empty]
     classifier = JavaClassImpl@91['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@16['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Exception']
 }
 
 LazyJavaClassifierType@75['FilterOutputStream'] {
     arguments = ArrayList@92[empty]
     classifier = JavaClassImpl@93['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
 LazyJavaClassifierType@94['Flushable'] {
@@ -194,14 +188,14 @@ LazyJavaClassifierType@110['Object'] {
 LazyJavaClassifierType@69['OutputStream'] {
     arguments = ArrayList@112[empty]
     classifier = JavaClassImpl@113['OutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
 LazyJavaClassifierType@114['PrintStream'] {
     arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['PrintStream']
-    memberScope = LazyJavaClassMemberScope@28
+    memberScope = LazyJavaClassMemberScope@27
     nullable = 'false': Boolean@99
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -243,28 +237,28 @@ LazyJavaClassifierType@129['String'] {
 
 LazyJavaClassifierType@132['String'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@121['String']
+    classifier = JavaClassImpl@125['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@134['String'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@131['String']
+    classifier = JavaClassImpl@128['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@136['String'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@128['String']
+    classifier = JavaClassImpl@131['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
 
 LazyJavaClassifierType@138['String'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@125['String']
+    classifier = JavaClassImpl@121['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@122
 }
@@ -292,14 +286,14 @@ LazyJavaClassifierType@147['Throwable'] {
 
 LazyJavaClassifierType@150['Throwable'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@146['Throwable']
+    classifier = JavaClassImpl@142['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@143
 }
 
 LazyJavaClassifierType@152['Throwable'] {
     arguments = ArrayList@153[empty]
-    classifier = JavaClassImpl@142['Throwable']
+    classifier = JavaClassImpl@146['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@143
 }
@@ -332,12 +326,12 @@ LazyJavaPackageFragmentProvider@158 {
     packageFragments('kotlin.io': FqName@174) = null
     packageFragments('kotlin.jvm': FqName@175) = null
     topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
-    topLevelClasses(JavaClassImpl@91['Exception']) = LazyJavaClassDescriptor@15['Exception']
-    topLevelClasses(JavaClassImpl@93['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@113['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
-    topLevelClasses(JavaClassImpl@116['PrintStream']) = LazyJavaClassDescriptor@25['PrintStream']
+    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
+    topLevelClasses(JavaClassImpl@87['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']
+    topLevelClasses(JavaClassImpl@116['PrintStream']) = LazyJavaClassDescriptor@24['PrintStream']
     topLevelClasses(JavaClassImpl@176['RuntimeException']) = LazyJavaClassDescriptor@37['RuntimeException']
     topLevelClasses(JavaClassImpl@177['System']) = LazyJavaClassDescriptor@45['System']
 }
@@ -346,10 +340,8 @@ LazyJavaPackageFragment@160['<root>'] {
     classes('Int': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('RuntimeException': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('System': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@179
     deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@179
     functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@179
 }
 
@@ -363,9 +355,56 @@ LazyJavaPackageFragment@164['java'] {
 LazyJavaPackageFragment@168['lang'] {
     classes('RuntimeException': Name@180) = LazyJavaClassDescriptor@37['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@188
     classes('System': Name@181) = LazyJavaClassDescriptor@45['System'] // through LazyPackageFragmentScopeForJavaPackage@188
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@188
     deserializedPackageScope = Empty@182 // through LazyPackageFragmentScopeForJavaPackage@188
     functions('RuntimeException': Name@180) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@188
     memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@188
 }
+
+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]
+    <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@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[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]
+}
+
+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]
+    <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/controlFlowAnalysis/kt1185enums.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
index e0b0a7abdeb..f27c698d9e6 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1185enums.lazy.log
@@ -38,3 +38,285 @@ LazyJavaPackageFragment@9['java'] {
 LazyJavaPackageFragment@11['lang'] {
     deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <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]
+}
+
+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]
+    <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@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]
+    <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]
+}
+
+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@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@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@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[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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <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@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 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 0de0b9128e3..2152695263a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1189.lazy.log
@@ -13,419 +13,508 @@ LazyJavaClassDescriptor@5['Lock'] {
     functions('lock': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['lock'] } // through LazyJavaClassMemberScope@10
     functions('unlock': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['unlock'] } // through LazyJavaClassMemberScope@10
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@10
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@10
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassDescriptor@20['ReadLock'] {
-    defaultType = JetTypeImpl@21['ReadLock']
-    enumEntryIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@23
-    functions('lock': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['lock'] } // through LazyJavaClassMemberScope@23
-    functions('unlock': Name@17) = ArrayList@27[1] { JavaMethodDescriptor@28['unlock'] } // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@23
-    nestedClasses('lock': Name@24) = null // through LazyJavaClassMemberScope@23
-    nestedClasses('unlock': Name@17) = null // through LazyJavaClassMemberScope@23
-    properties('lock': Name@24) = EmptyList@16[empty] // through LazyJavaClassMemberScope@23
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@23
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
+LazyJavaClassDescriptor@17['ReadLock'] {
+    defaultType = JetTypeImpl@18['ReadLock']
+    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@20
+    functions('lock': Name@21) = ArrayList@22[1] { JavaMethodDescriptor@23['lock'] } // through LazyJavaClassMemberScope@20
+    functions('unlock': Name@24) = ArrayList@25[1] { JavaMethodDescriptor@26['unlock'] } // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@20
+    nestedClassIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@20
+    nestedClasses('lock': Name@21) = null // through LazyJavaClassMemberScope@20
+    nestedClasses('unlock': Name@24) = null // through LazyJavaClassMemberScope@20
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@29['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
 }
 
-LazyJavaClassDescriptor@33['ReadWriteLock'] {
-    defaultType = JetTypeImpl@34['ReadWriteLock']
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('equals': Name@38) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['equals'] } // through LazyJavaClassMemberScope@36
-    functions('getReadHoldCount': Name@41) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('getWriteHoldCount': Name@42) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('readLock': Name@48) = ArrayList@49[1] { JavaMethodDescriptor@50['readLock'] } // through LazyJavaClassMemberScope@36
-    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    functions('writeLock': Name@51) = ArrayList@52[1] { JavaMethodDescriptor@53['writeLock'] } // through LazyJavaClassMemberScope@36
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@36
-    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@36
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@63['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@64['ReadWriteLock']
+LazyJavaClassDescriptor@31['ReadWriteLock'] {
+    defaultType = JetTypeImpl@32['ReadWriteLock']
+    functions('getReadHoldCount': Name@33) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
+    functions('getWriteHoldCount': Name@36) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
+    functions('readLock': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@39['readLock'] } // through LazyJavaClassMemberScope@35
+    functions('writeLock': Name@40) = ArrayList@41[1] { JavaMethodDescriptor@42['writeLock'] } // through LazyJavaClassMemberScope@35
+    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@35
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@44['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@45['ReadWriteLock']
 }
 
-LazyJavaClassDescriptor@65['ReentrantReadWriteLock'] {
-    defaultType = JetTypeImpl@66['ReentrantReadWriteLock']
-    enumEntryIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@68
+LazyJavaClassDescriptor@46['ReentrantReadWriteLock'] {
+    defaultType = JetTypeImpl@47['ReentrantReadWriteLock']
+    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@49
     functionTypeForSamInterface = null
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('equals': Name@38) = ArrayList@69[1] { DeserializedSimpleFunctionDescriptor@70['equals'] } // through LazyJavaClassMemberScope@68
-    functions('getReadHoldCount': Name@55) = ArrayList@71[1] { JavaMethodDescriptor@72['getReadHoldCount'] } // through LazyJavaClassMemberScope@68
-    functions('getWriteHoldCount': Name@56) = ArrayList@73[1] { JavaMethodDescriptor@74['getWriteHoldCount'] } // through LazyJavaClassMemberScope@68
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('readLock': Name@58) = ArrayList@75[1] { JavaMethodDescriptor@76['readLock'] } // through LazyJavaClassMemberScope@68
-    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    functions('writeLock': Name@62) = ArrayList@77[1] { JavaMethodDescriptor@78['writeLock'] } // through LazyJavaClassMemberScope@68
-    memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@68
-    nestedClassIndex = LinkedHashMap@80 // through LazyJavaClassMemberScope@68
-    nestedClasses('ReadLock': Name@81) = LazyJavaClassDescriptor@20['ReadLock'] // through LazyJavaClassMemberScope@68
-    nestedClasses('WriteLock': Name@82) = LazyJavaClassDescriptor@83['WriteLock'] // through LazyJavaClassMemberScope@68
-    nestedClasses('action': Name@35) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('getReadHoldCount': Name@55) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('getWriteHoldCount': Name@56) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('readCount': Name@57) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('readLock': Name@58) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('rl': Name@59) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('wl': Name@60) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('writeCount': Name@61) = null // through LazyJavaClassMemberScope@68
-    nestedClasses('writeLock': Name@62) = null // through LazyJavaClassMemberScope@68
-    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
-    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@68
+    functions('getReadHoldCount': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['getReadHoldCount'] } // through LazyJavaClassMemberScope@49
+    functions('getWriteHoldCount': Name@53) = ArrayList@54[1] { JavaMethodDescriptor@55['getWriteHoldCount'] } // through LazyJavaClassMemberScope@49
+    functions('readLock': Name@56) = ArrayList@57[1] { JavaMethodDescriptor@58['readLock'] } // through LazyJavaClassMemberScope@49
+    functions('writeLock': Name@59) = ArrayList@60[1] { JavaMethodDescriptor@61['writeLock'] } // through LazyJavaClassMemberScope@49
+    memberIndex = computeMemberIndex$1@62 // through LazyJavaClassMemberScope@49
+    nestedClassIndex = LinkedHashMap@63 // through LazyJavaClassMemberScope@49
+    nestedClasses('ReadLock': Name@64) = LazyJavaClassDescriptor@17['ReadLock'] // through LazyJavaClassMemberScope@49
+    nestedClasses('WriteLock': Name@65) = LazyJavaClassDescriptor@66['WriteLock'] // through LazyJavaClassMemberScope@49
+    nestedClasses('getReadHoldCount': Name@50) = null // through LazyJavaClassMemberScope@49
+    nestedClasses('getWriteHoldCount': Name@53) = null // through LazyJavaClassMemberScope@49
+    nestedClasses('readLock': Name@56) = null // through LazyJavaClassMemberScope@49
+    nestedClasses('writeLock': Name@59) = null // through LazyJavaClassMemberScope@49
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@67['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@68['ReentrantReadWriteLock']
+}
+
+LazyJavaClassDescriptor@69['Serializable'] {
+    functions('getReadHoldCount': Name@33) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('getWriteHoldCount': Name@36) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('lock': Name@7) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('readLock': Name@37) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('unlock': Name@11) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    functions('writeLock': Name@40) = EmptyList@34[empty] // through LazyJavaClassMemberScope@70
+    memberIndex = computeMemberIndex$1@71 // through LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
+}
+
+LazyJavaClassDescriptor@66['WriteLock'] {
+    defaultType = JetTypeImpl@73['WriteLock']
+    enumEntryIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@75
+    functions('lock': Name@76) = ArrayList@77[1] { JavaMethodDescriptor@78['lock'] } // through LazyJavaClassMemberScope@75
+    functions('unlock': Name@79) = ArrayList@80[1] { JavaMethodDescriptor@81['unlock'] } // through LazyJavaClassMemberScope@75
+    memberIndex = computeMemberIndex$1@82 // through LazyJavaClassMemberScope@75
+    nestedClassIndex = LinkedHashMap@83 // through LazyJavaClassMemberScope@75
+    nestedClasses('lock': Name@76) = null // through LazyJavaClassMemberScope@75
+    nestedClasses('unlock': Name@79) = null // through LazyJavaClassMemberScope@75
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@84['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@85['ReentrantReadWriteLock']
+    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
 }
 
-LazyJavaClassDescriptor@86['Serializable'] {
-    defaultType = JetTypeImpl@87['Serializable']
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('equals': Name@38) = ArrayList@89[1] { DeserializedSimpleFunctionDescriptor@90['equals'] } // through LazyJavaClassMemberScope@88
-    functions('getReadHoldCount': Name@41) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('getWriteHoldCount': Name@42) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('lock': Name@7) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('readLock': Name@48) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('unlock': Name@11) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    functions('writeLock': Name@51) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    memberIndex = computeMemberIndex$1@91 // through LazyJavaClassMemberScope@88
-    properties('action': Name@35) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('compareTo': Name@37) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('equals': Name@38) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('hasNext': Name@43) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('iterator': Name@45) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('next': Name@46) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('rangeTo': Name@47) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('readCount': Name@57) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('readLock': Name@58) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('rl': Name@59) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('unlock': Name@17) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('wl': Name@60) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('writeCount': Name@61) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    properties('writeLock': Name@62) = EmptyList@16[empty] // through LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+LazyJavaClassTypeConstructor@16['Lock'] {
+    parameters = ArrayList@86[empty]
+    supertypes = ArrayList@87[1] { JetTypeImpl@88['Any'] }
 }
 
-LazyJavaClassDescriptor@83['WriteLock'] {
-    defaultType = JetTypeImpl@93['WriteLock']
-    enumEntryIndex = LinkedHashMap@94 // through LazyJavaClassMemberScope@95
-    functions('lock': Name@15) = ArrayList@96[1] { JavaMethodDescriptor@97['lock'] } // through LazyJavaClassMemberScope@95
-    functions('unlock': Name@98) = ArrayList@99[1] { JavaMethodDescriptor@100['unlock'] } // through LazyJavaClassMemberScope@95
-    memberIndex = computeMemberIndex$1@101 // through LazyJavaClassMemberScope@95
-    nestedClassIndex = LinkedHashMap@102 // through LazyJavaClassMemberScope@95
-    nestedClasses('lock': Name@15) = null // through LazyJavaClassMemberScope@95
-    nestedClasses('unlock': Name@98) = null // through LazyJavaClassMemberScope@95
-    properties('lock': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@95
-    properties('unlock': Name@98) = EmptyList@16[empty] // through LazyJavaClassMemberScope@95
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@103['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
+LazyJavaClassTypeConstructor@30['ReadLock'] {
+    parameters = ArrayList@89[empty]
+    supertypes = ArrayList@90[2] { LazyJavaClassifierType@91['Lock'], LazyJavaClassifierType@92['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@19['Lock'] {
-    parameters = ArrayList@105[empty]
-    supertypes = ArrayList@106[1] { JetTypeImpl@107['Any'] }
+LazyJavaClassTypeConstructor@45['ReadWriteLock'] {
+    parameters = ArrayList@93[empty]
+    supertypes = ArrayList@94[1] { JetTypeImpl@88['Any'] }
 }
 
-LazyJavaClassTypeConstructor@32['ReadLock'] {
-    parameters = ArrayList@108[empty]
-    supertypes = ArrayList@109[2] { LazyJavaClassifierType@110['Lock'], LazyJavaClassifierType@111['Serializable'] }
+LazyJavaClassTypeConstructor@68['ReentrantReadWriteLock'] {
+    parameters = ArrayList@95[empty]
+    supertypes = ArrayList@96[2] { LazyJavaClassifierType@97['ReadWriteLock'], LazyJavaClassifierType@98['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@64['ReadWriteLock'] {
-    parameters = ArrayList@112[empty]
-    supertypes = ArrayList@113[1] { JetTypeImpl@107['Any'] }
+LazyJavaClassTypeConstructor@72['Serializable'] {
+    parameters = ArrayList@99[empty]
+    supertypes = ArrayList@100[1] { JetTypeImpl@88['Any'] }
 }
 
-LazyJavaClassTypeConstructor@85['ReentrantReadWriteLock'] {
-    parameters = ArrayList@114[empty]
-    supertypes = ArrayList@115[2] { LazyJavaClassifierType@116['ReadWriteLock'], LazyJavaClassifierType@117['Serializable'] }
+LazyJavaClassTypeConstructor@85['WriteLock'] {
+    parameters = ArrayList@101[empty]
+    supertypes = ArrayList@102[2] { LazyJavaClassifierType@103['Lock'], LazyJavaClassifierType@104['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@92['Serializable'] {
-    parameters = ArrayList@118[empty]
-    supertypes = ArrayList@119[1] { JetTypeImpl@107['Any'] }
-}
-
-LazyJavaClassTypeConstructor@104['WriteLock'] {
-    parameters = ArrayList@120[empty]
-    supertypes = ArrayList@121[2] { LazyJavaClassifierType@122['Lock'], LazyJavaClassifierType@123['Serializable'] }
-}
-
-LazyJavaClassifierType@110['Lock'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['Lock']
+LazyJavaClassifierType@91['Lock'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaClassImpl@106['Lock']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@122['Lock'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@127['Lock']
+LazyJavaClassifierType@103['Lock'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaClassImpl@108['Lock']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@128['Lock'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@130['Lock']
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+LazyJavaClassifierType@109['Lock'] {
+    arguments = ArrayList@110[empty]
+    classifier = JavaClassImpl@111['Lock']
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@132['Lock'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@134['Lock']
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+LazyJavaClassifierType@113['Lock'] {
+    arguments = ArrayList@114[empty]
+    classifier = JavaClassImpl@115['Lock']
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@135['Lock'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaClassImpl@130['Lock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+LazyJavaClassifierType@116['Lock'] {
+    arguments = ArrayList@117[empty]
+    classifier = JavaClassImpl@115['Lock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
 }
 
-LazyJavaClassifierType@138['Lock'] {
+LazyJavaClassifierType@119['Lock'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaClassImpl@111['Lock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
+}
+
+LazyJavaClassifierType@121['Object'] {
+    classifier = JavaClassImpl@122['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@124['Object'] {
+    classifier = JavaClassImpl@125['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@126['Object'] {
+    classifier = JavaClassImpl@127['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@128['Object'] {
+    classifier = JavaClassImpl@129['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@130['Object'] {
+    classifier = JavaClassImpl@131['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@132['Object'] {
+    classifier = JavaClassImpl@133['Object']
+    typeConstructor = DeserializedClassTypeConstructor@123
+}
+
+LazyJavaClassifierType@134['ReadLock'] {
+    arguments = ArrayList@135[empty]
+    classifier = JavaClassImpl@136['ReadLock']
+    memberScope = LazyJavaClassMemberScope@20
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
+}
+
+LazyJavaClassifierType@137['ReadLock'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaClassImpl@136['ReadLock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@30['ReadLock']
+}
+
+LazyJavaClassifierType@97['ReadWriteLock'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@134['Lock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@19['Lock']
+    classifier = JavaClassImpl@140['ReadWriteLock']
+    memberScope = LazyJavaClassMemberScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@45['ReadWriteLock']
 }
 
-LazyJavaClassifierType@140['Object'] {
-    classifier = JavaClassImpl@141['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@92['Serializable'] {
+    arguments = ArrayList@141[empty]
+    classifier = JavaClassImpl@142['Serializable']
+    memberScope = LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
 }
 
-LazyJavaClassifierType@143['Object'] {
-    classifier = JavaClassImpl@144['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@104['Serializable'] {
+    arguments = ArrayList@143[empty]
+    classifier = JavaClassImpl@144['Serializable']
+    memberScope = LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
 }
 
-LazyJavaClassifierType@145['Object'] {
-    classifier = JavaClassImpl@146['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@98['Serializable'] {
+    arguments = ArrayList@145[empty]
+    classifier = JavaClassImpl@146['Serializable']
+    memberScope = LazyJavaClassMemberScope@70
+    typeConstructor = LazyJavaClassTypeConstructor@72['Serializable']
 }
 
-LazyJavaClassifierType@147['Object'] {
-    classifier = JavaClassImpl@148['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@147['WriteLock'] {
+    arguments = ArrayList@148[empty]
+    classifier = JavaClassImpl@149['WriteLock']
+    memberScope = LazyJavaClassMemberScope@75
+    nullable = 'false': Boolean@112
+    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
 }
 
-LazyJavaClassifierType@149['Object'] {
-    classifier = JavaClassImpl@150['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaClassifierType@150['WriteLock'] {
+    arguments = ArrayList@151[empty]
+    classifier = JavaClassImpl@149['WriteLock']
+    nullable = 'true': Boolean@118
+    typeConstructor = LazyJavaClassTypeConstructor@85['WriteLock']
 }
 
-LazyJavaClassifierType@151['Object'] {
-    classifier = JavaClassImpl@152['Object']
-    typeConstructor = DeserializedClassTypeConstructor@142
+LazyJavaPackageFragmentProvider@152 {
+    packageFragments('<root>': FqName@153) = LazyJavaPackageFragment@154['<root>']
+    packageFragments('ReentrantReadWriteLock': FqName@155) = null
+    packageFragments('T': FqName@156) = null
+    packageFragments('inline': FqName@157) = null
+    packageFragments('java': FqName@158) = LazyJavaPackageFragment@159['java']
+    packageFragments('java.io': FqName@160) = LazyJavaPackageFragment@161['io']
+    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
+    packageFragments('java.lang.ReentrantReadWriteLock': FqName@164) = null
+    packageFragments('java.lang.T': FqName@165) = null
+    packageFragments('java.lang.inline': FqName@166) = null
+    packageFragments('java.util': FqName@167) = LazyJavaPackageFragment@168['util']
+    packageFragments('java.util.concurrent': FqName@169) = LazyJavaPackageFragment@170['concurrent']
+    packageFragments('java.util.concurrent.locks': FqName@171) = LazyJavaPackageFragment@172['locks']
+    packageFragments('java.util.concurrent.locks.ReentrantReadWriteLock': FqName@173) = null
+    packageFragments('kotlin': FqName@174) = null
+    packageFragments('kotlin.ReentrantReadWriteLock': FqName@175) = null
+    packageFragments('kotlin.T': FqName@176) = null
+    packageFragments('kotlin.inline': FqName@177) = null
+    packageFragments('kotlin.io': FqName@178) = null
+    packageFragments('kotlin.jvm': FqName@179) = null
+    packageFragments('kt1189': FqName@180) = null
+    packageFragments('kt1189.ReentrantReadWriteLock': FqName@181) = null
+    packageFragments('kt1189.T': FqName@182) = null
+    packageFragments('kt1189.inline': FqName@183) = null
+    topLevelClasses(JavaClassImpl@115['Lock']) = LazyJavaClassDescriptor@5['Lock']
+    topLevelClasses(JavaClassImpl@140['ReadWriteLock']) = LazyJavaClassDescriptor@31['ReadWriteLock']
+    topLevelClasses(JavaClassImpl@184['ReentrantReadWriteLock']) = LazyJavaClassDescriptor@46['ReentrantReadWriteLock']
+    topLevelClasses(JavaClassImpl@146['Serializable']) = LazyJavaClassDescriptor@69['Serializable']
 }
 
-LazyJavaClassifierType@153['ReadLock'] {
-    arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@155['ReadLock']
-    memberScope = LazyJavaClassMemberScope@23
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
+LazyJavaPackageFragment@170['concurrent'] {
+    classes('locks': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@186
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@186
+    functions('locks': Name@188) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@186
+    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@186
 }
 
-LazyJavaClassifierType@156['ReadLock'] {
-    arguments = ArrayList@157[empty]
-    classifier = JavaClassImpl@155['ReadLock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@32['ReadLock']
+LazyJavaPackageFragment@159['java'] {
+    classes('lang': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('util': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('lang': Name@193) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('util': Name@194) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@191
 }
 
-LazyJavaClassifierType@116['ReadWriteLock'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@159['ReadWriteLock']
-    memberScope = LazyJavaClassMemberScope@36
-    typeConstructor = LazyJavaClassTypeConstructor@64['ReadWriteLock']
+LazyJavaPackageFragment@163['lang'] {
+    classes('action': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('getReadHoldCount': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('getWriteHoldCount': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('readLock': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('writeLock': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('action': Name@196) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('getReadHoldCount': Name@50) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('getWriteHoldCount': Name@53) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('readLock': Name@56) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('writeLock': Name@59) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
-LazyJavaClassifierType@111['Serializable'] {
-    arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@161['Serializable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+LazyJavaPackageFragment@172['locks'] {
+    classes('ReentrantReadWriteLock': Name@199) = LazyJavaClassDescriptor@46['ReentrantReadWriteLock'] // through LazyPackageFragmentScopeForJavaPackage@200
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('ReentrantReadWriteLock': Name@201) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@200
 }
 
-LazyJavaClassifierType@123['Serializable'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@163['Serializable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+LazyJavaPackageFragment@168['util'] {
+    classes('concurrent': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@204
+    deserializedPackageScope = Empty@187 // through LazyPackageFragmentScopeForJavaPackage@204
+    functions('concurrent': Name@205) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@204
+    memberIndex = computeMemberIndex$1@206 // through LazyPackageFragmentScopeForJavaPackage@204
 }
 
-LazyJavaClassifierType@117['Serializable'] {
-    arguments = ArrayList@164[empty]
-    classifier = JavaClassImpl@165['Serializable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+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]
 }
 
-LazyJavaClassifierType@166['WriteLock'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaClassImpl@168['WriteLock']
-    memberScope = LazyJavaClassMemberScope@95
-    nullable = 'false': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
+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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaClassifierType@169['WriteLock'] {
-    arguments = ArrayList@170[empty]
-    classifier = JavaClassImpl@168['WriteLock']
-    nullable = 'true': Boolean@137
-    typeConstructor = LazyJavaClassTypeConstructor@104['WriteLock']
+ResolutionTaskHolder@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaPackageFragmentProvider@171 {
-    packageFragments('<root>': FqName@172) = LazyJavaPackageFragment@173['<root>']
-    packageFragments('ReentrantReadWriteLock': FqName@174) = null
-    packageFragments('T': FqName@175) = null
-    packageFragments('inline': FqName@176) = null
-    packageFragments('java': FqName@177) = LazyJavaPackageFragment@178['java']
-    packageFragments('java.io': FqName@179) = LazyJavaPackageFragment@180['io']
-    packageFragments('java.lang': FqName@181) = LazyJavaPackageFragment@182['lang']
-    packageFragments('java.lang.ReentrantReadWriteLock': FqName@183) = null
-    packageFragments('java.lang.T': FqName@184) = null
-    packageFragments('java.lang.inline': FqName@185) = null
-    packageFragments('java.util': FqName@186) = LazyJavaPackageFragment@187['util']
-    packageFragments('java.util.concurrent': FqName@188) = LazyJavaPackageFragment@189['concurrent']
-    packageFragments('java.util.concurrent.locks': FqName@190) = LazyJavaPackageFragment@191['locks']
-    packageFragments('java.util.concurrent.locks.ReentrantReadWriteLock': FqName@192) = null
-    packageFragments('kotlin': FqName@193) = null
-    packageFragments('kotlin.ReentrantReadWriteLock': FqName@194) = null
-    packageFragments('kotlin.T': FqName@195) = null
-    packageFragments('kotlin.inline': FqName@196) = null
-    packageFragments('kotlin.io': FqName@197) = null
-    packageFragments('kotlin.jvm': FqName@198) = null
-    packageFragments('kt1189': FqName@199) = null
-    packageFragments('kt1189.ReentrantReadWriteLock': FqName@200) = null
-    packageFragments('kt1189.T': FqName@201) = null
-    packageFragments('kt1189.inline': FqName@202) = null
-    topLevelClasses(JavaClassImpl@134['Lock']) = LazyJavaClassDescriptor@5['Lock']
-    topLevelClasses(JavaClassImpl@159['ReadWriteLock']) = LazyJavaClassDescriptor@33['ReadWriteLock']
-    topLevelClasses(JavaClassImpl@203['ReentrantReadWriteLock']) = LazyJavaClassDescriptor@65['ReentrantReadWriteLock']
-    topLevelClasses(JavaClassImpl@165['Serializable']) = LazyJavaClassDescriptor@86['Serializable']
+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]
 }
 
-LazyJavaPackageFragment@189['concurrent'] {
-    classes('locks': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('locks': Name@207) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@205
+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]
 }
 
-LazyJavaPackageFragment@178['java'] {
-    classes('lang': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    classes('util': Name@211) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('lang': Name@212) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('util': Name@213) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@210
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
 }
 
-LazyJavaPackageFragment@182['lang'] {
-    classes('action': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('compareTo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getReadHoldCount': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('getWriteHoldCount': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('hasNext': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('lock': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('next': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('rangeTo': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('readLock': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('unlock': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    classes('writeLock': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@215
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('action': Name@35) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('compareTo': Name@37) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('equals': Name@38) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('getReadHoldCount': Name@55) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('getWriteHoldCount': Name@56) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('hasNext': Name@43) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('invoke': Name@44) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('iterator': Name@45) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('lock': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('next': Name@46) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('rangeTo': Name@47) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('readLock': Name@58) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('unlock': Name@17) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('writeLock': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@215
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
 }
 
-LazyJavaPackageFragment@191['locks'] {
-    classes('ReentrantReadWriteLock': Name@217) = LazyJavaClassDescriptor@65['ReentrantReadWriteLock'] // through LazyPackageFragmentScopeForJavaPackage@218
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('ReentrantReadWriteLock': Name@219) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    memberIndex = computeMemberIndex$1@220 // through LazyPackageFragmentScopeForJavaPackage@218
+ResolutionTaskHolder@235 {
+    <name not found> = ArrayList@236[1] { ResolutionCandidate@237 }
+    <name not found> = ArrayList@238[1] { ResolutionCandidate@237 }
 }
 
-LazyJavaPackageFragment@187['util'] {
-    classes('concurrent': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('concurrent': Name@223) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    memberIndex = computeMemberIndex$1@224 // through LazyPackageFragmentScopeForJavaPackage@222
+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> = 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[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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
index ee31a5c9850..76f7ba8331b 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1191.lazy.log
@@ -39,9 +39,22 @@ LazyJavaPackageFragment@13['java'] {
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
-LazyJavaPackageFragment@15['lang'] {
-    classes('plus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+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@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
index 0407e6b1b4d..033d0d2e389 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1219.1301.lazy.log
@@ -1,46 +1,40 @@
 LazyJavaClassDescriptor@0['Appendable'] {
     functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
-LazyJavaClassDescriptor@7['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+LazyJavaClassDescriptor@6['AutoCloseable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@11['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+LazyJavaClassDescriptor@10['Closeable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassDescriptor@15['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+LazyJavaClassDescriptor@14['FilterOutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@19['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
+LazyJavaClassDescriptor@18['OutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
 }
 
-LazyJavaClassDescriptor@23['PrintStream'] {
-    defaultType = JetTypeImpl@24['PrintStream']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@26
-    functions('println': Name@5) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@26
-    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@26
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+LazyJavaClassDescriptor@22['PrintStream'] {
+    defaultType = JetTypeImpl@23['PrintStream']
+    enumEntryIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@25
+    functions('println': Name@26) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@25
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@25
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@25
+    nestedClasses('println': Name@26) = null // through LazyJavaClassMemberScope@25
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
@@ -56,27 +50,27 @@ LazyJavaClassDescriptor@35['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@45['System']
 }
 
-LazyJavaClassTypeConstructor@6['Appendable'] {
+LazyJavaClassTypeConstructor@5['Appendable'] {
     parameters = ArrayList@46[empty]
     supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+LazyJavaClassTypeConstructor@9['AutoCloseable'] {
     parameters = ArrayList@49[empty]
     supertypes = ArrayList@50[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['Closeable'] {
+LazyJavaClassTypeConstructor@13['Closeable'] {
     parameters = ArrayList@51[empty]
     supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@18['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
     parameters = ArrayList@54[empty]
     supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@22['OutputStream'] {
+LazyJavaClassTypeConstructor@21['OutputStream'] {
     parameters = ArrayList@57[empty]
     supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Closeable'] }
 }
@@ -94,35 +88,35 @@ LazyJavaClassifierType@63['Appendable'] {
     arguments = ArrayList@66[empty]
     classifier = JavaClassImpl@67['Appendable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
 LazyJavaClassifierType@53['AutoCloseable'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
-}
-
-LazyJavaClassifierType@59['Closeable'] {
-    arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@71['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
 LazyJavaClassifierType@64['Closeable'] {
+    arguments = ArrayList@70[empty]
+    classifier = JavaClassImpl@71['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
+}
+
+LazyJavaClassifierType@59['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@62['FilterOutputStream'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
 LazyJavaClassifierType@76['Flushable'] {
@@ -167,14 +161,14 @@ LazyJavaClassifierType@92['Object'] {
 LazyJavaClassifierType@56['OutputStream'] {
     arguments = ArrayList@94[empty]
     classifier = JavaClassImpl@95['OutputStream']
-    memberScope = LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
 }
 
 LazyJavaClassifierType@96['PrintStream'] {
     arguments = ArrayList@97[empty]
     classifier = JavaClassImpl@98['PrintStream']
-    memberScope = LazyJavaClassMemberScope@26
+    memberScope = LazyJavaClassMemberScope@25
     nullable = 'false': Boolean@81
     typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
@@ -230,11 +224,11 @@ LazyJavaPackageFragmentProvider@107 {
     packageFragments('kt1219.T': FqName@138) = null
     packageFragments('kt1219.Unit': FqName@139) = null
     topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
-    topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@15['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@19['OutputStream']
-    topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@23['PrintStream']
+    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
+    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']
     topLevelClasses(JavaClassImpl@140['System']) = LazyJavaClassDescriptor@35['System']
 }
 
@@ -249,22 +243,132 @@ LazyJavaPackageFragment@120['lang'] {
     classes('System': Name@146) = LazyJavaClassDescriptor@35['System'] // through LazyPackageFragmentScopeForJavaPackage@147
     classes('bar': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@147
     classes('foreach': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('hasNext': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('invoke': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('iterator': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('next': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('op': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('operation': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('op': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('operation': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@147
     deserializedPackageScope = Empty@143 // through LazyPackageFragmentScopeForJavaPackage@147
     functions('bar': Name@148) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
     functions('foreach': Name@149) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('hasNext': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('invoke': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('iterator': Name@152) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('next': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('op': Name@154) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('operation': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('op': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    functions('operation': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@147
+    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@147
+}
+
+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]
+    <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 }
+    <name not found> = EmptyList@2[empty]
+    <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@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> = 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[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]
+    <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/controlFlowAnalysis/kt1571.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
index 23d6c060fbd..58ec23bf6e5 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.lazy.log
@@ -45,18 +45,212 @@ LazyJavaPackageFragment@11['lang'] {
     classes('c1': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('c2': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('div': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('divAssign': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inc': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('times': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('timesAssign': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('timesAssign': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
     deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
     functions('A': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('div': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('divAssign': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@43) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inc': Name@44) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('times': Name@45) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('timesAssign': Name@46) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('timesAssign': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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> = EmptyList@33[empty]
+    <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> = 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]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <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> = 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]
+    <name not found> = EmptyList@33[empty]
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+    <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> = 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@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@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@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> = 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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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 6b39d644bfa..8a325d456fa 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@61['String']
+    classifier = JavaClassImpl@65['String']
     nullable = 'true': Boolean@52
     typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@68['String'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaClassImpl@65['String']
+    classifier = JavaClassImpl@61['String']
     nullable = 'true': Boolean@52
     typeConstructor = DeserializedClassTypeConstructor@62
 }
@@ -182,3 +182,98 @@ LazyJavaPackageFragment@84['lang'] {
     functions('bar': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@112
 }
+
+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@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[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]
+    <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]
+    <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]
+    <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]
+    <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@153 {
+    <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@154 {
+    <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/controlFlowAnalysis/kt2166_kt2103.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
index fa294fafee8..3684f2167dc 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2166_kt2103.lazy.log
@@ -29,3 +29,12 @@ LazyJavaPackageFragment@11['lang'] {
     functions('bar': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
index 3ad5673ce04..1563213ea2b 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2226.lazy.log
@@ -35,9 +35,17 @@ LazyJavaPackageFragment@15['java'] {
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@17['lang'] {
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
index 9662ba74fae..7ac60e99450 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2330.lazy.log
@@ -44,3 +44,235 @@ LazyJavaPackageFragment@16['lang'] {
     functions('p': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <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> = 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]
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@29[empty]
+}
+
+ResolutionTaskHolder@58 {
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+    <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> = 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@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 }
+}
+
+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 }
+}
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 af05b29704e..bd7de900eab 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2369.lazy.log
@@ -37,7 +37,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
 }
@@ -51,7 +51,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
 }
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 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@40['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -133,28 +133,57 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Int': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('doSmth': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('plus': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('doSmth': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('lang': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('plus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@75) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('doSmth': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('plus': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Exception': Name@75) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('doSmth': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('Exception': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('doSmth': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
+}
+
+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@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+}
+
+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]
+    <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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
index 4cd67525316..de8a5c43363 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2845.lazy.log
@@ -117,9 +117,9 @@ LazyJavaClassifierType@67['E'] {
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@71['E'] {
@@ -131,9 +131,9 @@ LazyJavaClassifierType@71['E'] {
 
 LazyJavaClassifierType@73['E'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@65['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -211,36 +211,72 @@ LazyJavaPackageFragment@100['java'] {
 
 LazyJavaPackageFragment@104['lang'] {
     classes('ArrayList': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('add': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('equals': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('equals': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
     deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@125
     functions('ArrayList': Name@124) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('add': Name@126) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('equals': Name@127) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('equals': Name@126) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
 LazyJavaPackageFragment@108['util'] {
-    classes('ArrayList': Name@129) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('ArrayList': Name@131) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('ArrayList': Name@128) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@129
+    deserializedPackageScope = Empty@119 // through LazyPackageFragmentScopeForJavaPackage@129
+    functions('ArrayList': Name@130) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@129
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@129
 }
 
 LazyJavaTypeParameterDescriptor@24['E'] {
-    defaultType = JetTypeImpl@133['E']
+    defaultType = JetTypeImpl@132['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
-    upperBounds = LinkedHashSet@134[1] { NullableType@135 }
+    upperBounds = LinkedHashSet@133[1] { NullableType@134 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
-LazyJavaTypeParameterResolver@136 {
-    resolve(JavaTypeParameterImpl@137['E']) = LazyJavaTypeParameterDescriptor@19['E']
+LazyJavaTypeParameterResolver@135 {
+    resolve(JavaTypeParameterImpl@136['E']) = LazyJavaTypeParameterDescriptor@24['E']
 }
 
-LazyJavaTypeParameterResolver@138 {
-    resolve(JavaTypeParameterImpl@139['E']) = LazyJavaTypeParameterDescriptor@24['E']
+LazyJavaTypeParameterResolver@137 {
+    resolve(JavaTypeParameterImpl@138['E']) = LazyJavaTypeParameterDescriptor@19['E']
+}
+
+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> = EmptyList@121[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 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@157[1] { 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@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]
+    <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 79c1d88e8f8..67e8a6e2512 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.lazy.log
@@ -49,3 +49,120 @@ LazyJavaPackageFragment@24['lang'] {
     functions('doSmth': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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> = 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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@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]
+    <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]
+    <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]
+}
+
+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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
index fcb7c0b57ca..a19308f5c27 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2972.lazy.log
@@ -6,173 +6,189 @@ LazyAnnotationDescriptor@0 {
 
 LazyJavaClassDescriptor@4['AutoCloseable'] {
     defaultType = JetTypeImpl@5['AutoCloseable']
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('clone': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('close': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['close'] } // through LazyJavaClassMemberScope@8
-    functions('equals': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['equals'] } // through LazyJavaClassMemberScope@8
-    functions('finalize': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('getClass': Name@17) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('hashCode': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['hashCode'] } // through LazyJavaClassMemberScope@8
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('notify': Name@23) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('notifyAll': Name@24) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    functions('toString': Name@25) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['toString'] } // through LazyJavaClassMemberScope@8
-    functions('wait': Name@28) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@8
-    properties('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('close': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('closed': Name@31) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('e': Name@32) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    properties('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
+    functions('clone': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('close': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['close'] } // through LazyJavaClassMemberScope@8
+    functions('equals': Name@12) = ArrayList@13[1] { DeserializedSimpleFunctionDescriptor@14['equals'] } // through LazyJavaClassMemberScope@8
+    functions('finalize': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('getClass': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('hashCode': Name@17) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['hashCode'] } // through LazyJavaClassMemberScope@8
+    functions('notify': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('notifyAll': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    functions('toString': Name@22) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['toString'] } // through LazyJavaClassMemberScope@8
+    functions('wait': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@8
+    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@8
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@28['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@35['Closeable'] {
-    allDescriptors = ArrayList@36[4] { DeserializedSimpleFunctionDescriptor@37['hashCode'], JavaMethodDescriptor@38['close'], DeserializedSimpleFunctionDescriptor@39['toString'], ... } // through LazyJavaClassMemberScope@40
-    annotations = LazyJavaAnnotations@41
-    defaultType = JetTypeImpl@42['Closeable']
-    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@40
-    functionTypeForSamInterface = JetTypeImpl@44['Function0<1>']
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('clone': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('close': Name@45) = ArrayList@46[1] { JavaMethodDescriptor@38['close'] } // through LazyJavaClassMemberScope@40
-    functions('equals': Name@13) = ArrayList@47[1] { DeserializedSimpleFunctionDescriptor@48['equals'] } // through LazyJavaClassMemberScope@40
-    functions('finalize': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('getClass': Name@17) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('hashCode': Name@18) = ArrayList@49[1] { DeserializedSimpleFunctionDescriptor@37['hashCode'] } // through LazyJavaClassMemberScope@40
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('notify': Name@23) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('notifyAll': Name@24) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    functions('toString': Name@25) = ArrayList@50[1] { DeserializedSimpleFunctionDescriptor@39['toString'] } // through LazyJavaClassMemberScope@40
-    functions('wait': Name@28) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@40
-    nestedClassIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@40
-    nestedClasses('block': Name@6) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('close': Name@30) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('closed': Name@31) = null // through LazyJavaClassMemberScope@40
-    nestedClasses('e': Name@32) = null // through LazyJavaClassMemberScope@40
-    properties('block': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('close': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('closed': Name@31) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('e': Name@32) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    properties('not': Name@22) = EmptyList@7[empty] // through LazyJavaClassMemberScope@40
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@53['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@54['Closeable']
+LazyJavaClassDescriptor@29['Closeable'] {
+    allDescriptors = ArrayList@30[4] { DeserializedSimpleFunctionDescriptor@31['hashCode'], JavaMethodDescriptor@32['close'], DeserializedSimpleFunctionDescriptor@33['toString'], ... } // through LazyJavaClassMemberScope@34
+    annotations = LazyJavaAnnotations@35
+    defaultType = JetTypeImpl@36['Closeable']
+    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@34
+    functionTypeForSamInterface = JetTypeImpl@38['Function0<1>']
+    functions('clone': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('close': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@32['close'] } // through LazyJavaClassMemberScope@34
+    functions('equals': Name@12) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@42['equals'] } // through LazyJavaClassMemberScope@34
+    functions('finalize': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('getClass': Name@16) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('hashCode': Name@17) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@31['hashCode'] } // through LazyJavaClassMemberScope@34
+    functions('notify': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('notifyAll': Name@21) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    functions('toString': Name@22) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@33['toString'] } // through LazyJavaClassMemberScope@34
+    functions('wait': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@34
+    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@34
+    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@34
+    nestedClasses('close': Name@47) = null // through LazyJavaClassMemberScope@34
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@48['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@49['Closeable']
 }
 
-LazyJavaClassDescriptor@55['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@56['Exception']
+LazyJavaClassDescriptor@50['Exception'] {
+    typeConstructor = LazyJavaClassTypeConstructor@51['Exception']
 }
 
-LazyJavaClassTypeConstructor@34['AutoCloseable'] {
-    parameters = ArrayList@57[empty]
-    supertypes = ArrayList@58[1] { JetTypeImpl@59['Any'] }
+LazyJavaClassTypeConstructor@28['AutoCloseable'] {
+    parameters = ArrayList@52[empty]
+    supertypes = ArrayList@53[1] { JetTypeImpl@54['Any'] }
 }
 
-LazyJavaClassTypeConstructor@54['Closeable'] {
-    parameters = ArrayList@60[empty]
-    supertypes = ArrayList@61[1] { LazyJavaClassifierType@62['AutoCloseable'] }
+LazyJavaClassTypeConstructor@49['Closeable'] {
+    parameters = ArrayList@55[empty]
+    supertypes = ArrayList@56[1] { LazyJavaClassifierType@57['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@56['Exception'] {
-    parameters = ArrayList@63[empty]
-    supertypes = ArrayList@64[1] { LazyJavaClassifierType@65['Throwable'] }
+LazyJavaClassTypeConstructor@51['Exception'] {
+    parameters = ArrayList@58[empty]
+    supertypes = ArrayList@59[1] { LazyJavaClassifierType@60['Throwable'] }
 }
 
-LazyJavaClassifierType@62['AutoCloseable'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaClassImpl@67['AutoCloseable']
+LazyJavaClassifierType@57['AutoCloseable'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaClassImpl@62['AutoCloseable']
     memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@34['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@28['AutoCloseable']
 }
 
-LazyJavaClassifierType@68['Object'] {
-    classifier = JavaClassImpl@69['Object']
-    typeConstructor = DeserializedClassTypeConstructor@70
+LazyJavaClassifierType@63['Object'] {
+    classifier = JavaClassImpl@64['Object']
+    typeConstructor = DeserializedClassTypeConstructor@65
 }
 
-LazyJavaClassifierType@65['Throwable'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaClassImpl@72['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@73
+LazyJavaClassifierType@60['Throwable'] {
+    arguments = ArrayList@66[empty]
+    classifier = JavaClassImpl@67['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@68
 }
 
-LazyJavaPackageFragmentProvider@74 {
-    packageFragments('<root>': FqName@75) = LazyJavaPackageFragment@76['<root>']
-    packageFragments('Closeable': FqName@77) = null
-    packageFragments('Exception': FqName@78) = null
-    packageFragments('R': FqName@79) = null
-    packageFragments('T': FqName@80) = null
-    packageFragments('inline': FqName@81) = null
-    packageFragments('java': FqName@82) = LazyJavaPackageFragment@83['java']
-    packageFragments('java.io': FqName@84) = LazyJavaPackageFragment@85['io']
-    packageFragments('java.io.Closeable': FqName@86) = null
-    packageFragments('java.lang': FqName@87) = LazyJavaPackageFragment@88['lang']
-    packageFragments('java.lang.Closeable': FqName@89) = null
-    packageFragments('java.lang.Exception': FqName@90) = null
-    packageFragments('java.lang.R': FqName@91) = null
-    packageFragments('java.lang.T': FqName@92) = null
-    packageFragments('java.lang.inline': FqName@93) = null
-    packageFragments('kotlin': FqName@94) = null
-    packageFragments('kotlin.Closeable': FqName@95) = null
-    packageFragments('kotlin.Exception': FqName@96) = null
-    packageFragments('kotlin.R': FqName@97) = null
-    packageFragments('kotlin.T': FqName@98) = null
-    packageFragments('kotlin.inline': FqName@99) = null
-    packageFragments('kotlin.io': FqName@100) = null
-    packageFragments('kotlin.jvm': FqName@101) = null
-    topLevelClasses(JavaClassImpl@67['AutoCloseable']) = LazyJavaClassDescriptor@4['AutoCloseable']
-    topLevelClasses(JavaClassImpl@102['Closeable']) = LazyJavaClassDescriptor@35['Closeable']
-    topLevelClasses(JavaClassImpl@103['Exception']) = LazyJavaClassDescriptor@55['Exception']
+LazyJavaPackageFragmentProvider@69 {
+    packageFragments('<root>': FqName@70) = LazyJavaPackageFragment@71['<root>']
+    packageFragments('Closeable': FqName@72) = null
+    packageFragments('Exception': FqName@73) = null
+    packageFragments('R': FqName@74) = null
+    packageFragments('T': FqName@75) = null
+    packageFragments('inline': FqName@76) = null
+    packageFragments('java': FqName@77) = LazyJavaPackageFragment@78['java']
+    packageFragments('java.io': FqName@79) = LazyJavaPackageFragment@80['io']
+    packageFragments('java.io.Closeable': FqName@81) = null
+    packageFragments('java.lang': FqName@82) = LazyJavaPackageFragment@83['lang']
+    packageFragments('java.lang.Closeable': FqName@84) = null
+    packageFragments('java.lang.Exception': FqName@85) = null
+    packageFragments('java.lang.R': FqName@86) = null
+    packageFragments('java.lang.T': FqName@87) = null
+    packageFragments('java.lang.inline': FqName@88) = null
+    packageFragments('kotlin': FqName@89) = null
+    packageFragments('kotlin.Closeable': FqName@90) = null
+    packageFragments('kotlin.Exception': FqName@91) = null
+    packageFragments('kotlin.R': FqName@92) = null
+    packageFragments('kotlin.T': FqName@93) = null
+    packageFragments('kotlin.inline': FqName@94) = null
+    packageFragments('kotlin.io': FqName@95) = null
+    packageFragments('kotlin.jvm': FqName@96) = null
+    topLevelClasses(JavaClassImpl@62['AutoCloseable']) = LazyJavaClassDescriptor@4['AutoCloseable']
+    topLevelClasses(JavaClassImpl@97['Closeable']) = LazyJavaClassDescriptor@29['Closeable']
+    topLevelClasses(JavaClassImpl@98['Exception']) = LazyJavaClassDescriptor@50['Exception']
 }
 
-LazyJavaPackageFragment@76['<root>'] {
-    classes('Closeable': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Exception': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('block': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('close': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('inline': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('java': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('not': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('close': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('java': Name@110) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@105
+LazyJavaPackageFragment@71['<root>'] {
+    classes('Closeable': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Exception': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('block': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('inline': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('java': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('block': Name@102) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('java': Name@106) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
-LazyJavaPackageFragment@85['io'] {
-    classes('Closeable': Name@112) = LazyJavaClassDescriptor@35['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('Closeable': Name@114) = ArrayList@115[1] { SamConstructorDescriptor@116['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@113
+LazyJavaPackageFragment@80['io'] {
+    classes('Closeable': Name@108) = LazyJavaClassDescriptor@29['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@109
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('Closeable': Name@110) = ArrayList@111[1] { SamConstructorDescriptor@112['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@109
+    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@109
 }
 
-LazyJavaPackageFragment@83['java'] {
-    classes('io': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('lang': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('io': Name@121) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('lang': Name@122) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@119
+LazyJavaPackageFragment@78['java'] {
+    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('io': Name@117) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('lang': Name@118) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
-LazyJavaPackageFragment@88['lang'] {
-    classes('Exception': Name@106) = LazyJavaClassDescriptor@55['Exception'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('block': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('close': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('invoke': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('not': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('block': Name@6) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('close': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('invoke': Name@21) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('not': Name@22) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@124
+LazyJavaPackageFragment@83['lang'] {
+    classes('Exception': Name@101) = LazyJavaClassDescriptor@50['Exception'] // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('block': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@120
+    deserializedPackageScope = Empty@105 // through LazyPackageFragmentScopeForJavaPackage@120
+    functions('block': Name@102) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@120
+    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
index 801bf3e727a..7af3ed0f364 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt3501.lazy.log
@@ -12,16 +12,16 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@21
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 dc817d82985..f01a8f28ada 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt510.lazy.log
@@ -25,3 +25,15 @@ LazyJavaPackageFragment@7['lang'] {
     classes('field': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
index 09162235279..cc52428990d 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt607.lazy.log
@@ -27,6 +27,22 @@ LazyJavaPackageFragment@8['java'] {
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
index fc5726ad4f5..f022e164b69 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt609.lazy.log
@@ -28,3 +28,18 @@ LazyJavaPackageFragment@7['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 }
+    <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@39 {
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@41 }
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@41 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
index 4e5cfeddc2f..d8235179b1f 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt610.lazy.log
@@ -14,3 +14,8 @@ LazyJavaPackageFragment@4['java'] {
     functions('lang': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
     memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
 }
+
+ResolutionTaskHolder@17 {
+    <name not found> = ArrayList@18[1] { ResolutionCandidate@19 }
+    <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 81985db7707..6e1d870341b 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt776.lazy.log
@@ -20,12 +20,62 @@ LazyJavaPackageFragment@5['java'] {
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('compareTo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('doSmth': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('inc': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('doSmth': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('compareTo': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('doSmth': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('inc': Name@24) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('doSmth': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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@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@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> = 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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
index 2585da83c0a..26f4fe28fd5 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/kt897.lazy.log
@@ -30,3 +30,24 @@ LazyJavaPackageFragment@9['lang'] {
     classes('k': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
index 111516c3e19..1eef4d4e57a 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/propertiesOrderInPackage.lazy.log
@@ -31,3 +31,17 @@ LazyJavaPackageFragment@12['lang'] {
     classes('b': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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 }
+    <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 af298327467..8bfd82f8da3 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/referenceToPropertyInitializer.lazy.log
@@ -48,18 +48,160 @@ LazyJavaPackageFragment@14['java'] {
 
 LazyJavaPackageFragment@16['lang'] {
     classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('obj1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('sum': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('obj': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('obj1': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('sum': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
     deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
     functions('foo': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('minus': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@45) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('sum': Name@46) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('sum': Name@43) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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> = 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 }
+    <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> = 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 }
+    <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> = 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 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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> = 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@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@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+    <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 360292f23cf..c0fafcd451c 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/repeatUnitializedErrorOnlyForLocalVars.lazy.log
@@ -32,8 +32,77 @@ LazyJavaPackageFragment@11['java'] {
 LazyJavaPackageFragment@13['lang'] {
     classes('a': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('b': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+    <name not found> = EmptyList@23[empty]
+}
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+    <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]
+}
+
+ResolutionTaskHolder@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <name not found> = EmptyList@23[empty]
+    <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@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[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+    <name not found> = ArrayList@65[8] { ResolutionCandidate@62, ResolutionCandidate@63, ResolutionCandidate@64, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
index e5d940f999a..b90f1bc30ae 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/scopeOfAnonymousInitializer.lazy.log
@@ -28,3 +28,10 @@ LazyJavaPackageFragment@8['lang'] {
     classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
index b802069d136..ffd4bf49f50 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/uninitializedInLocalDeclarations.lazy.log
@@ -64,3 +64,106 @@ LazyJavaPackageFragment@20['lang'] {
     functions('doSmth': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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]
+    <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]
+    <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]
+    <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]
+    <name not found> = EmptyList@40[empty]
+    <name not found> = EmptyList@40[empty]
+}
+
+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@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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
index b47b06ffbab..a3636c91486 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/unmappedArgs.lazy.log
@@ -17,25 +17,64 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('plus': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('foo': 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> = 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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
index 8c637cab710..cf70d78f415 100644
--- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/varInitializationInIfInCycle.lazy.log
@@ -28,38 +28,81 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Boolean': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('Collection': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('hasNext': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('iterator': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('next': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('use': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('hasNext': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('iterator': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('next': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('use': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('use': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('use': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('compareTo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('hasNext': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('iterator': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('next': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('use': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('compareTo': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('hasNext': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('iterator': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('next': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('use': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('use': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('use': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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@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@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 }
+}
+
+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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
index 81a6da724d1..832bd5f48f8 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/ForWithoutBraces.lazy.log
@@ -8,42 +8,95 @@ LazyJavaPackageFragmentProvider@0 {
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('hasNext': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('iterator': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('next': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('plus': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('plusAssign': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('rangeTo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('hasNext': Name@10) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('iterator': Name@12) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('next': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('plus': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('plusAssign': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('rangeTo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@11
+    classes('plusAssign': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
+    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
+    functions('plusAssign': Name@10) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@11
+    memberIndex = computeMemberIndex$1@14 // through LazyPackageFragmentScopeForJavaPackage@11
 }
 
 LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@17) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@6['lang'] {
-    classes('hasNext': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('iterator': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('next': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plusAssign': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('rangeTo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('hasNext': Name@10) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('iterator': Name@12) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('next': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plus': Name@14) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plusAssign': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('rangeTo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('plusAssign': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('plusAssign': Name@10) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@19
+}
+
+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@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@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@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@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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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 4ab974fdafb..140c463f05a 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/ForbidStatementAsDirectFunctionBody.lazy.log
@@ -41,3 +41,54 @@ LazyJavaPackageFragment@11['lang'] {
     functions('iterator': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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/emptyIf.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
index 8b92938ee1c..b155b13fef5 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/emptyIf.lazy.log
@@ -16,30 +16,74 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('Unit': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('invoke': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('foo': 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> = 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]
+    <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]
+    <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@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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
index 0e6dab11277..c02f50010a8 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/forLoopWithNullableRange.lazy.log
@@ -21,36 +21,121 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('It': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('It': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('iterator': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('It': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('iterator': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('It': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('hasNext': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('iterator': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('next': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('It': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('hasNext': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('iterator': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('next': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('It': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('iterator': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('It': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('iterator': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = 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@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 }
+}
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[2] { ResolutionCandidate@69, ResolutionCandidate@70 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
index cb446404d0a..2e857b350fa 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/forWithNullableIterator.lazy.log
@@ -19,32 +19,108 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Coll': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('hasNext': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('iterator': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('next': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Coll': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('hasNext': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('iterator': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('next': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('next': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('Coll': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('hasNext': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('next': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Coll': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('hasNext': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('iterator': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('next': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('Coll': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('hasNext': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('iterator': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('next': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('Coll': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('hasNext': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('next': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('Coll': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('hasNext': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('next': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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> = 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]
+}
+
+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/controlStructures/jumpAcrossFunctionBoundary.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
index b7114a9decf..17149d8243e 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/jumpAcrossFunctionBoundary.lazy.log
@@ -18,28 +18,45 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Unit': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('call': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('call': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('invoke': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('call': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('f': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('call': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('call': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('call': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('call': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('f': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
index ffd81dd9b2e..d6122eb7df6 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt1075.lazy.log
@@ -21,9 +21,93 @@ LazyJavaPackageFragment@5['java'] {
 
 LazyJavaPackageFragment@7['lang'] {
     classes('contains': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('rangeTo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
     functions('contains': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('rangeTo': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 {
+    <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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
index ac9fdcc9604..1fc47a44e26 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt4310.lazy.log
@@ -22,3 +22,18 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
index ba0c809c8e5..c500279442e 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt657.lazy.log
@@ -38,11 +38,41 @@ LazyJavaPackageFragment@12['lang'] {
     classes('Pair': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     classes('cond1': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
     classes('cond2': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('rangeTo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
     functions('Pair': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     functions('cond1': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     functions('cond2': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('rangeTo': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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]
+}
+
+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, ... }
 }
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 07eadde08f5..c7f7872b638 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
@@ -5,46 +5,40 @@ DescriptorResolver@0 {
 LazyJavaClassDescriptor@2['Appendable'] {
     functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
 }
 
-LazyJavaClassDescriptor@9['AutoCloseable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
+LazyJavaClassDescriptor@8['AutoCloseable'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@9
+    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@9
+    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@13['Closeable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+LazyJavaClassDescriptor@12['Closeable'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
-LazyJavaClassDescriptor@17['FilterOutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+LazyJavaClassDescriptor@16['FilterOutputStream'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@21['OutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+LazyJavaClassDescriptor@20['OutputStream'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
-LazyJavaClassDescriptor@25['PrintStream'] {
-    defaultType = JetTypeImpl@26['PrintStream']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
-    functions('println': Name@7) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@28
-    nestedClasses('println': Name@7) = null // through LazyJavaClassMemberScope@28
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@28
+LazyJavaClassDescriptor@24['PrintStream'] {
+    defaultType = JetTypeImpl@25['PrintStream']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
+    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
+    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -60,27 +54,27 @@ LazyJavaClassDescriptor@37['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@47['System']
 }
 
-LazyJavaClassTypeConstructor@8['Appendable'] {
+LazyJavaClassTypeConstructor@7['Appendable'] {
     parameters = ArrayList@48[empty]
     supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
 }
 
-LazyJavaClassTypeConstructor@12['AutoCloseable'] {
+LazyJavaClassTypeConstructor@11['AutoCloseable'] {
     parameters = ArrayList@51[empty]
     supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
 }
 
-LazyJavaClassTypeConstructor@16['Closeable'] {
+LazyJavaClassTypeConstructor@15['Closeable'] {
     parameters = ArrayList@53[empty]
     supertypes = ArrayList@54[1] { LazyJavaClassifierType@55['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
     parameters = ArrayList@56[empty]
     supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@24['OutputStream'] {
+LazyJavaClassTypeConstructor@23['OutputStream'] {
     parameters = ArrayList@59[empty]
     supertypes = ArrayList@60[1] { LazyJavaClassifierType@61['Closeable'] }
 }
@@ -98,35 +92,35 @@ LazyJavaClassifierType@65['Appendable'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['Appendable']
     memberScope = LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
 }
 
 LazyJavaClassifierType@55['AutoCloseable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@9
+    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
 LazyJavaClassifierType@61['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+    memberScope = LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
 LazyJavaClassifierType@66['Closeable'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+    memberScope = LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
 LazyJavaClassifierType@64['FilterOutputStream'] {
     arguments = ArrayList@76[empty]
     classifier = JavaClassImpl@77['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
 LazyJavaClassifierType@78['Flushable'] {
@@ -171,14 +165,14 @@ LazyJavaClassifierType@94['Object'] {
 LazyJavaClassifierType@58['OutputStream'] {
     arguments = ArrayList@96[empty]
     classifier = JavaClassImpl@97['OutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
 LazyJavaClassifierType@98['PrintStream'] {
     arguments = ArrayList@99[empty]
     classifier = JavaClassImpl@100['PrintStream']
-    memberScope = LazyJavaClassMemberScope@28
+    memberScope = LazyJavaClassMemberScope@27
     nullable = 'false': Boolean@83
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -243,11 +237,11 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kt770_351_735.j': FqName@149) = null
     packageFragments('kt770_351_735.w': FqName@150) = null
     topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@9['AutoCloseable']
-    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@13['Closeable']
-    topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
-    topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@25['PrintStream']
+    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
+    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']
     topLevelClasses(JavaClassImpl@151['System']) = LazyJavaClassDescriptor@37['System']
 }
 
@@ -261,27 +255,289 @@ LazyJavaPackageFragment@120['java'] {
 LazyJavaPackageFragment@124['lang'] {
     classes('System': Name@157) = LazyJavaClassDescriptor@37['System'] // through LazyPackageFragmentScopeForJavaPackage@158
     classes('bar': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('dec': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('doSmth': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('hasNext': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('inc': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('iterator': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('j': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('minus': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('next': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('println': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    classes('rangeTo': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@158
+    classes('doSmth': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@158
+    classes('j': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@158
     deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@158
     functions('bar': Name@159) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('dec': Name@160) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('doSmth': Name@161) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('hasNext': Name@162) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('inc': Name@163) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('iterator': Name@164) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('j': Name@169) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('minus': Name@166) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('next': Name@167) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('println': Name@7) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('rangeTo': Name@168) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@158
+    functions('doSmth': Name@160) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
+    functions('j': Name@162) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@158
+    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@158
+}
+
+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]
+    <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@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+    <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@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@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[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 }
+}
+
+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> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+}
+
+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@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@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@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]
+    <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@335 {
+    <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@336 {
+    <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/controlStructures/kt786.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
index 441393f7e43..b590e477818 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt786.lazy.log
@@ -21,11 +21,51 @@ LazyJavaPackageFragment@5['java'] {
 
 LazyJavaPackageFragment@7['lang'] {
     classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('inc': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('minus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
     functions('bar': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('inc': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('minus': Name@24) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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@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@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> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
index 9303604bd1b..fff68ece530 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/kt799.lazy.log
@@ -37,3 +37,74 @@ LazyJavaPackageFragment@11['lang'] {
     functions('doSmth': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+}
+
+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]
+}
+
+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@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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
index 2ab46f2b411..d9fa905c2a4 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/tryReturnType.lazy.log
@@ -46,3 +46,21 @@ LazyJavaPackageFragment@19['lang'] {
     functions('doSmth': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@35
 }
+
+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 }
+    <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/controlStructures/valVarLoopParameter.lazy.log b/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
index 0e13529b582..e4db6966a56 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/valVarLoopParameter.lazy.log
@@ -7,35 +7,49 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@9) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('hasNext': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('iterator': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('next': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    classes('rangeTo': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@11
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('hasNext': Name@10) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('iterator': Name@12) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('next': Name@13) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    functions('rangeTo': Name@14) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@11
-    memberIndex = computeMemberIndex$1@17 // through LazyPackageFragmentScopeForJavaPackage@11
-}
-
 LazyJavaPackageFragment@4['java'] {
-    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('lang': Name@20) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('lang': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@11
+    deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@11
+    functions('lang': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@11
+    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@11
 }
 
-LazyJavaPackageFragment@6['lang'] {
-    classes('hasNext': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('iterator': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('next': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('rangeTo': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('hasNext': Name@10) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('iterator': Name@12) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('next': Name@13) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('rangeTo': Name@14) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+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@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@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@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@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, ... }
 }
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 96f2da0ec9b..dce35ccde03 100644
--- a/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
+++ b/compiler/testData/diagnostics/tests/controlStructures/when.kt234.kt973.lazy.log
@@ -44,3 +44,56 @@ LazyJavaPackageFragment@13['lang'] {
     functions('Pair': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+    <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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
index de9fe418c2a..310fb6b6017 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/classIndirectlyInheritsNested.lazy.log
@@ -19,3 +19,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
index b7708ff55cf..cade85036a0 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/classInheritsNested.lazy.log
@@ -16,3 +16,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
     memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
+
+ResolutionTaskHolder@19 {
+    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
+    <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 7043b9672c5..7fd0010ba83 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/cyclicHierarchy.lazy.log
@@ -86,3 +86,375 @@ LazyJavaPackageFragment@24['lang'] {
     functions('foo': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
 }
+
+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]
+    <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@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]
+    <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@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]
+}
+
+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]
+}
+
+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> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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 c63f377f2e3..f2ea21e3794 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaCycle.lazy.log
@@ -38,3 +38,8 @@ LazyJavaPackageFragment@17['java'] {
     functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <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 c366ab6a5ad..7a3f2306c61 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kotlinJavaKotlinCycle.lazy.log
@@ -41,3 +41,13 @@ LazyJavaPackageFragment@18['java'] {
     functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
index 5526aa66eef..02cd30cc0c5 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/kt303.lazy.log
@@ -43,3 +43,22 @@ LazyJavaPackageFragment@11['lang'] {
     functions('Foo': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}
diff --git a/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log b/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
index 136eb04a562..02b00d2a564 100644
--- a/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
+++ b/compiler/testData/diagnostics/tests/cyclicHierarchy/twoClassesWithNestedCycle.lazy.log
@@ -19,3 +19,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
index 76fb7c5cec9..f98633ae129 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/bothParamsAreNotProperties.lazy.log
@@ -51,3 +51,120 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@42 }
+}
+
+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@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 765bb402aa9..ff71b077c14 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionInSubClass.lazy.log
@@ -52,3 +52,70 @@ LazyJavaPackageFragment@14['lang'] {
     functions('component1': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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]
+    <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@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 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
index 149e96f65ec..d509840bf71 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionVisibility.lazy.log
@@ -60,3 +60,193 @@ LazyJavaPackageFragment@15['lang'] {
     functions('component3': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
 }
+
+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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <name not found> = EmptyList@38[empty]
+    <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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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@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 }
+}
+
+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/dataClasses/componentFunctionsAreFinal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
index 1b8c9fc42f7..c37236afa8e 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentFunctionsAreFinal.lazy.log
@@ -30,27 +30,42 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('data': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('component1': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('component2': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('data': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
-LazyJavaPackageFragment@14['lang'] {
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('component1': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('component2': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
index ceb6e61eb7a..d3aafcb46bd 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/componentNamedComponent1.lazy.log
@@ -47,3 +47,52 @@ LazyJavaPackageFragment@12['lang'] {
     functions('invoke': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <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 }
+}
+
+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@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]
+    <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/conflictingCopyOverloads.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
index 4392c4e9342..c6f19017c79 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingCopyOverloads.lazy.log
@@ -50,3 +50,44 @@ LazyJavaPackageFragment@16['lang'] {
     functions('A': Name@26) = 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@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]
+    <name not found> = EmptyList@32[empty]
+    <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@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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
index c8daeec73c5..4781cd3a8c6 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/conflictingOverloads.lazy.log
@@ -39,3 +39,8 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <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 cd5f30ac846..8efd88fb743 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/dataClassOverrideConflict.lazy.log
@@ -42,3 +42,18 @@ LazyJavaPackageFragment@15['java'] {
     functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
index 8c53ede6d43..bd9ab4a4379 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/emptyConstructor.lazy.log
@@ -43,3 +43,120 @@ LazyJavaPackageFragment@11['lang'] {
     functions('component2': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 76fb7c5cec9..52ec6327e01 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVal.lazy.log
@@ -51,3 +51,85 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@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]
+}
+
+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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 76fb7c5cec9..52ec6327e01 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/firstParamIsVar.lazy.log
@@ -51,3 +51,85 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@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]
+}
+
+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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 b5e6f56d4e5..60cd959f8ba 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasComponent1.lazy.log
@@ -33,3 +33,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <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 b5e6f56d4e5..60cd959f8ba 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/implementTraitWhichHasFinalComponent1.lazy.log
@@ -33,3 +33,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <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 76fb7c5cec9..8e3638e6ff5 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/multiDeclaration.lazy.log
@@ -51,3 +51,55 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@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]
+}
+
+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]
+    <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> = 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 }
+}
+
+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/dataClasses/multiDeclarationFor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
index 502db918581..db572b86718 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/multiDeclarationFor.lazy.log
@@ -34,36 +34,91 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('component1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('component2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('data': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('hasNext': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('iterator': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('next': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('component1': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('component2': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('hasNext': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('iterator': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('next': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('component1': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('component2': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('component1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('component2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('hasNext': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('iterator': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('next': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('component1': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('component2': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('hasNext': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('iterator': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('next': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('component1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('component2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('component1': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('component2': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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 }
+}
+
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
index 8c53ede6d43..bd9ab4a4379 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/noConstructor.lazy.log
@@ -43,3 +43,120 @@ LazyJavaPackageFragment@11['lang'] {
     functions('component2': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@42 }
+}
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 699efe6f4e2..230ae2d26ff 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/notADataClass.lazy.log
@@ -42,3 +42,115 @@ LazyJavaPackageFragment@9['lang'] {
     functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 d09daa05481..0b06bd8fa35 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/oneValParam.lazy.log
@@ -47,3 +47,85 @@ LazyJavaPackageFragment@12['lang'] {
     functions('component2': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <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@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@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]
+    <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@53 {
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
index 7a57bda4912..4c712e190af 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/overrideInvisibleMember.lazy.log
@@ -38,3 +38,18 @@ LazyJavaPackageFragment@14['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
index 10c9aa63647..1cc6f9d44fd 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/paramNameSameToField.lazy.log
@@ -66,3 +66,151 @@ LazyJavaPackageFragment@17['lang'] {
     functions('component3': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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]
+    <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 }
+}
+
+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 }
+}
+
+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@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@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]
+}
+
+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 {
+    <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/dataClasses/secondParamIsVal.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
index 76fb7c5cec9..52ec6327e01 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVal.lazy.log
@@ -51,3 +51,85 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@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]
+}
+
+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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 76fb7c5cec9..52ec6327e01 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/secondParamIsVar.lazy.log
@@ -51,3 +51,85 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@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]
+}
+
+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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 76fb7c5cec9..b196a47b0c6 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/twoValParams.lazy.log
@@ -51,3 +51,50 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@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]
+}
+
+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]
+    <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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log b/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
index 76fb7c5cec9..b196a47b0c6 100644
--- a/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataClasses/twoVarParams.lazy.log
@@ -51,3 +51,50 @@ LazyJavaPackageFragment@13['lang'] {
     functions('component2': 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@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]
+}
+
+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]
+    <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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
index c716e0508c6..0d037a9ce27 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/CalleeExpression.lazy.log
@@ -19,22 +19,31 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('invoke': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
index c5f98aebe6e..a118e6bfac0 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/EmptyIf.lazy.log
@@ -21,22 +21,133 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Number': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Unit': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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@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@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@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 }
+}
+
+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> = 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> = 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 }
+}
+
+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 {
+    <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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
index 68d3099e864..b58bbb51e85 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/IsExpression.lazy.log
@@ -43,3 +43,74 @@ LazyJavaPackageFragment@9['lang'] {
     functions('plus': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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> = 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@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]
+    <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@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@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
index 2ddff28a044..4ab7c355982 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/WhenSubject.lazy.log
@@ -18,16 +18,26 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
+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@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
index fc5ac0fc620..ad703085332 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassBase.lazy.log
@@ -42,3 +42,37 @@ LazyJavaPackageFragment@10['lang'] {
     functions('equals': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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> = EmptyList@28[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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
index 7f30cfb5adb..e1493b9590a 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDefaultParameters.lazy.log
@@ -16,16 +16,31 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
index a64eb48a1f4..a2372695090 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegatedProperties.lazy.log
@@ -29,32 +29,270 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('df': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('df': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('df': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['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@12['lang'] {
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('df': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('df': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('df': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('df': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@30) = 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@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]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@51[1] { ResolutionCandidate@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]
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <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@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@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[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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 a0abe272b7c..9c861abf5d9 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassDelegation.lazy.log
@@ -23,3 +23,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
index 82d38f95039..08401d4dd26 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassFunctions.lazy.log
@@ -23,22 +23,46 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('String': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+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@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@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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
index 7f30cfb5adb..cdae901e195 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInMemberOfLocalClass.lazy.log
@@ -16,16 +16,41 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
+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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
index 059f97f2bc8..412cce53b2b 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassInitializer.lazy.log
@@ -18,22 +18,36 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+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@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@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
index 4f4f738d4d5..85a8d2e6496 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalClassProperty.lazy.log
@@ -26,16 +26,41 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
-LazyJavaPackageFragment@11['lang'] {
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@31
+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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
index 9686def8185..e956cf6b015 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObject.lazy.log
@@ -27,16 +27,36 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('Any': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
-LazyJavaPackageFragment@13['lang'] {
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@32
+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@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> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
index 0b1eacff670..809e37f46c0 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/LocalObjectDelegation.lazy.log
@@ -27,25 +27,50 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('Int': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('foo': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('equals': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('equals': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@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@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 }
+}
+
+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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
index 7f30cfb5adb..04be9f584c0 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/NestedLocalClass.lazy.log
@@ -16,16 +16,26 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
+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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log b/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
index 4141d7a420b..846cbc2802b 100644
--- a/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlow/local/kt2835.lazy.log
@@ -38,3 +38,27 @@ LazyJavaPackageFragment@10['lang'] {
     functions('equals': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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> = EmptyList@22[empty]
+}
+
+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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
index 2bacb5de03e..e9ce3701850 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AndOr.lazy.log
@@ -18,32 +18,315 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('times': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('times': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('times': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('times': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+}
+
+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@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@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@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> = 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[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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
index c03b902066f..32b605e3d29 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayAccess.lazy.log
@@ -20,34 +20,301 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('get': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('Array': Name@15) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('get': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('Array': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('get': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('get': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('Array': Name@15) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('get': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('get': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('Array': Name@15) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('get': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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> = EmptyList@22[empty]
+}
+
+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@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 }
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@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]
+    <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@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]
+    <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@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@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 }
+}
+
+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 {
+    <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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
index 584fc06a7fd..247d62d8df9 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayExpression.lazy.log
@@ -20,22 +20,31 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('get': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('get': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
index c56acc2d754..376a4b9d2b3 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayGetSetConvention.lazy.log
@@ -15,30 +15,161 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('get': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('set': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('get': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('set': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('get': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('set': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('get': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('set': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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@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> = 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@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 }
+}
+
+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 }
+}
+
+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[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> = 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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
index 070dcf5a571..37674366dc8 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ArrayIndices.lazy.log
@@ -16,26 +16,91 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('get': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('set': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('get': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('set': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('get': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('set': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('get': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('set': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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@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@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 }
+}
+
+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 }
+}
+
+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/dataFlowInfoTraversal/Assignment.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
index 00530a7c528..42491972419 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Assignment.lazy.log
@@ -18,26 +18,86 @@ LazyJavaPackageFragmentProvider@2 {
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('id': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('foo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('id': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('id': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('id': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('id': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('id': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('id': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('id': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
index ac396cf7645..a94b8777b97 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentInInitializer.lazy.log
@@ -19,25 +19,85 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('baz': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('foo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('baz': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('foo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('baz': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('baz': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('baz': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('baz': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('baz': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
index da467a8b6a4..3111fa6819b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentOperation.lazy.log
@@ -23,38 +23,203 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Number': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('plusAssign': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('y': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('plusAssign': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('y': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('plusAssign': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('y': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('plusAssign': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('y': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lang': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('get': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('plusAssign': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('y': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('plus': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('plusAssign': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('y': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('plusAssign': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('y': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('plusAssign': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('y': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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@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@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[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> = 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 }
+}
+
+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@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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@104 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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 5f100857d6a..3458463afdb 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/AssignmentToArrayElement.lazy.log
@@ -16,22 +16,66 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('set': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('set': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
index d07991cd73c..288a62e01be 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpression.lazy.log
@@ -17,41 +17,193 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('div': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('minus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('times': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('div': Name@18) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('minus': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('times': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@16
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('div': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('minus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('times': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('div': Name@18) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('minus': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('times': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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@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@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 }
+    <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 }
+    <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> = 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@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@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@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[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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
index 5fafbc84bab..879134c0797 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionBooleanOperations.lazy.log
@@ -20,22 +20,111 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+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@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@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 }
+}
+
+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 }
+}
+
+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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
index df1ad132ec7..a80ef345df3 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionCompareToConvention.lazy.log
@@ -23,25 +23,94 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Boolean': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('compareTo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('compareTo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('compareTo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('compareTo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('compareTo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('compareTo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('compareTo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+    <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@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 }
+}
+
+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 }
+}
+
+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/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
index 2f52617f6b4..f274c36693a 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionContainsConvention.lazy.log
@@ -20,26 +20,36 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('contains': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('rangeTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('contains': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('rangeTo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('contains': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('rangeTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('contains': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('rangeTo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
index b89eadb7cb2..f4e7d443f0c 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionElvis.lazy.log
@@ -39,3 +39,77 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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@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@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 }
+}
+
+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 }
+}
+
+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/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
index 01130415f8e..ea0513f7929 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionEqualsConvention.lazy.log
@@ -18,22 +18,61 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+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@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@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> = 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/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
index 49169cb99e2..38b5d13ea1e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionIdentifier.lazy.log
@@ -16,22 +16,56 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Number': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('compareTo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('compareTo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('compareTo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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@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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
index 6a859d50044..4dc7a674519 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/BinaryExpressionPlusConvention.lazy.log
@@ -18,26 +18,100 @@ LazyJavaPackageFragmentProvider@2 {
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('plus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('plus': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('plus': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('plus': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('plus': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@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 }
+}
+
+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 }
+}
+
+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> = 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 }
+    <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/Condition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
index d5c1e9f715d..e20d833c138 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Condition.lazy.log
@@ -16,22 +16,46 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
index 2cf425b093e..0479b0c5431 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ContinueOuterLoop.lazy.log
@@ -31,3 +31,178 @@ LazyJavaPackageFragment@7['lang'] {
     functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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> = EmptyList@17[empty]
+}
+
+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@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]
+    <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]
+    <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 }
+    <name not found> = EmptyList@17[empty]
+    <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> = EmptyList@17[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 }
+    <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]
+    <name not found> = EmptyList@17[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <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@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 {
+    <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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
index 412fe6e483c..c2cbe733d91 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DeepIf.lazy.log
@@ -18,33 +18,446 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('compareTo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('compareTo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('compareTo': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+}
+
+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@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> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+    <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 }
+    <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]
+    <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@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]
+    <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 }
+    <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]
+    <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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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@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@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@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@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> = 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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
index 35312d101ee..6c49f28effe 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhile.lazy.log
@@ -19,28 +19,160 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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@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 }
+}
+
+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[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
+    <name not found> = ArrayList@91[8] { ResolutionCandidate@88, ResolutionCandidate@89, ResolutionCandidate@90, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
index ab57b592d77..9c97a9149ce 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/DoWhileCondition.lazy.log
@@ -12,30 +12,111 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('compareTo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('compareTo': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('inc': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('compareTo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('inc': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('compareTo': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('inc': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+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@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@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@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 }
+}
+
+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 }
+}
+
+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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
index 9b85762ed89..31d8892417c 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Elvis.lazy.log
@@ -18,28 +18,119 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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]
+    <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@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@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 }
+}
+
+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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
index 831980defed..c5cc0420256 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ExclExcl.lazy.log
@@ -18,28 +18,308 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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 }
+    <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@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 }
+    <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 }
+    <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]
+    <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@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@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@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@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@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[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 }
+}
+
+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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
index 975b23c3e15..4e42be4a12c 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/For.lazy.log
@@ -19,43 +19,256 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('hasNext': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('next': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('Array': Name@15) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@18) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('hasNext': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('iterator': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('next': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('Array': Name@15) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('hasNext': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('next': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Array': Name@15) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('bar': Name@18) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('hasNext': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('iterator': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('next': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('Array': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Array': Name@15) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('bar': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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> = ArrayList@50[1] { ResolutionCandidate@49 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+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@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> = 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 }
+}
+
+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 {
+    <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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
index ed83abebac2..ba2e5a1333d 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ForLoopRange.lazy.log
@@ -16,30 +16,46 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('hasNext': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('iterator': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('next': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('hasNext': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('iterator': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('next': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('hasNext': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('iterator': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('next': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('hasNext': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('iterator': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('next': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+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@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@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@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
index bc2a548e32f..cf55fe52ac3 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/FunctionLiteral.lazy.log
@@ -23,31 +23,136 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('baz': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('baz': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('baz': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('equals': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('baz': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('baz': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('bar': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('baz': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('baz': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('equals': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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> = EmptyList@22[empty]
+}
+
+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@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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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 }
+    <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@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@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@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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
index d5c1e9f715d..3a1a2e5ce94 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfStatement.lazy.log
@@ -16,22 +16,121 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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@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 }
+}
+
+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 }
+}
+
+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> = 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[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
index 35312d101ee..b6c906834c4 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElse.lazy.log
@@ -19,28 +19,312 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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 }
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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> = 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]
+    <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]
+    <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@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]
+    <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]
+    <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@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 }
+    <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@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 }
+}
+
+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 }
+}
+
+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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
index 9b85762ed89..aaa0afa7a4b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IfThenElseBothInvalid.lazy.log
@@ -18,28 +18,129 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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@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[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 }
+}
+
+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[2] { ResolutionCandidate@80, ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[2] { 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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
index 5a29615fe03..0a52b9e2da8 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/IsExpression.lazy.log
@@ -24,3 +24,18 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
index 584fc06a7fd..76b7b9f5529 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ManyIfs.lazy.log
@@ -20,22 +20,1056 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Number': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('get': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('get': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+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@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@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 }
+}
+
+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 }
+}
+
+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> = 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[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[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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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[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[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[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@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@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@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@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[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 }
+}
+
+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 }
+}
+
+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[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 }
+}
+
+ResolutionTaskHolder@517 {
+    <name not found> = ArrayList@518[1] { ResolutionCandidate@519 }
+    <name not found> = ArrayList@520[1] { ResolutionCandidate@519 }
+}
+
+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@529 {
+    <name not found> = ArrayList@530[1] { ResolutionCandidate@531 }
+    <name not found> = ArrayList@532[1] { ResolutionCandidate@531 }
+}
+
+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@541 {
+    <name not found> = ArrayList@542[1] { ResolutionCandidate@543 }
+    <name not found> = ArrayList@544[1] { ResolutionCandidate@543 }
+}
+
+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@553 {
+    <name not found> = ArrayList@554[1] { ResolutionCandidate@555 }
+    <name not found> = ArrayList@556[1] { ResolutionCandidate@555 }
+}
+
+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@565 {
+    <name not found> = ArrayList@566[1] { ResolutionCandidate@567 }
+    <name not found> = ArrayList@568[1] { ResolutionCandidate@567 }
+}
+
+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@577 {
+    <name not found> = ArrayList@578[1] { ResolutionCandidate@579 }
+    <name not found> = ArrayList@580[1] { ResolutionCandidate@579 }
+}
+
+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@589 {
+    <name not found> = ArrayList@590[1] { ResolutionCandidate@591 }
+    <name not found> = ArrayList@592[1] { ResolutionCandidate@591 }
+}
+
+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@601 {
+    <name not found> = ArrayList@602[1] { ResolutionCandidate@603 }
+    <name not found> = ArrayList@604[1] { ResolutionCandidate@603 }
+}
+
+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@613 {
+    <name not found> = ArrayList@614[1] { ResolutionCandidate@615 }
+    <name not found> = ArrayList@616[1] { ResolutionCandidate@615 }
+}
+
+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@625 {
+    <name not found> = ArrayList@626[1] { ResolutionCandidate@627 }
+    <name not found> = ArrayList@628[1] { ResolutionCandidate@627 }
+}
+
+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@637 {
+    <name not found> = ArrayList@638[1] { ResolutionCandidate@639 }
+    <name not found> = ArrayList@640[1] { ResolutionCandidate@639 }
+}
+
+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@649 {
+    <name not found> = ArrayList@650[1] { ResolutionCandidate@651 }
+    <name not found> = ArrayList@652[1] { ResolutionCandidate@651 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
index aa1be3fb8a6..df916f43456 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/MultiDeclaration.lazy.log
@@ -43,3 +43,27 @@ LazyJavaPackageFragment@11['lang'] {
     functions('component1': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
index b1999019706..ddd92ce1b08 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ObjectExpression.lazy.log
@@ -26,28 +26,112 @@ LazyJavaPackageFragment@8['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('bar': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('bar': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('bar': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+}
+
+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@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]
+}
+
+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[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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
index ec5426440ec..9b833a957ea 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/QualifiedExpression.lazy.log
@@ -22,34 +22,146 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('baz': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('bar': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('baz': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('plus': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('bar': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('baz': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('baz': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@17) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('bar': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('baz': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('equals': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('baz': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('A': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('bar': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('baz': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = 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]
+    <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@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 }
+}
+
+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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
index 7ed83d92947..eb30ccaa46e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Return.lazy.log
@@ -20,28 +20,168 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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 }
+    <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@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@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@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 }
+}
+
+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[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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
index 644f82f9546..d56077df74e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/StringTemplate.lazy.log
@@ -28,3 +28,48 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@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@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 }
+}
+
+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/dataFlowInfoTraversal/ThisSuper.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
index d5e4e180017..2e5267758e0 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/ThisSuper.lazy.log
@@ -24,31 +24,273 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('baz': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('bar': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('baz': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('bar': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('baz': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('bar': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('baz': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('equals': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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@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@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> = 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> = 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 }
+}
+
+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 {
+    <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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
index 8ad345f9bfe..4e0255f60bf 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/Throw.lazy.log
@@ -52,21 +52,21 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@22['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@34['String'] {
     arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@22['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@30['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@33
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -141,31 +141,116 @@ LazyJavaPackageFragment@58['<root>'] {
     classes('RuntimeException': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('toString': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('RuntimeException': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('bar': Name@76) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('toString': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('RuntimeException': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('bar': Name@76) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@62['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('lang': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@64['lang'] {
-    classes('RuntimeException': Name@75) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('toString': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('RuntimeException': Name@80) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('bar': Name@76) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('toString': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('RuntimeException': Name@75) = LazyJavaClassDescriptor@4['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('RuntimeException': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('bar': Name@76) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
+}
+
+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@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]
+    <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@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[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 }
+}
+
+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, ... }
+    <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 f0987cd0301..ce8634bc7ae 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryCatch.lazy.log
@@ -38,29 +38,119 @@ LazyJavaPackageFragment@12['<root>'] {
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('bar': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('Exception': Name@27) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('bar': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('bar': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Exception': Name@27) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('bar': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('bar': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@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 }
+    <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]
+}
+
+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@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@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[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[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
+    <name not found> = ArrayList@93[8] { ResolutionCandidate@90, ResolutionCandidate@91, ResolutionCandidate@92, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
index d8a8d6d6bdb..aa898385308 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/TryFinally.lazy.log
@@ -44,3 +44,58 @@ LazyJavaPackageFragment@14['java'] {
 LazyJavaPackageFragment@16['lang'] {
     classes('Exception': Name@25) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@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@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> = 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 }
+}
+
+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> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
index 0de7c3ea4b4..1fca64871e8 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/UnaryExpression.lazy.log
@@ -26,37 +26,260 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
     classes('minus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
     classes('not': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('bar': Name@21) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('baz': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('minus': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('not': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('plus': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('bar': Name@21) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('baz': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('equals': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('minus': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('not': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('minus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('not': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('bar': Name@21) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('baz': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('minus': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('not': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('plus': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('baz': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('equals': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('minus': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('not': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('bar': Name@21) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('baz': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('equals': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('minus': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('not': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+}
+
+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 }
+    <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 }
+    <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]
+    <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]
+    <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]
+}
+
+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@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 }
+}
+
+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 {
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
index 9b85762ed89..f60adcec344 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/When.lazy.log
@@ -18,28 +18,110 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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]
+}
+
+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@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[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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
index 2d1dc48074e..f444885bc2e 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryAs.lazy.log
@@ -16,22 +16,76 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Number': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
index 5a29615fe03..466748d2062 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenEntryIs.lazy.log
@@ -24,3 +24,53 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@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@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@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 }
+}
+
+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/dataFlowInfoTraversal/WhenIn.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
index 097695a3c57..3f198226429 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenIn.lazy.log
@@ -16,22 +16,61 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('List': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('contains': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('contains': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('contains': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('contains': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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@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 }
+}
+
+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/dataFlowInfoTraversal/WhenSubject.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
index 5a29615fe03..0a52b9e2da8 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhenSubject.lazy.log
@@ -24,3 +24,18 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
index 7ed83d92947..7f3d88ba5d5 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/While.lazy.log
@@ -20,28 +20,216 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
     classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('bar': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+}
+
+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@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 }
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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> = 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]
+    <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]
+    <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@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@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@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 }
+}
+
+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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
index 3980567194f..04fcb0f3aeb 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/WhileCondition.lazy.log
@@ -12,26 +12,106 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('inc': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('equals': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('inc': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('inc': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('inc': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+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@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@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@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 }
+}
+
+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 }
+}
+
+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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
index 6659a6fdc63..c1c6bd88fe2 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt4332WhenBranches.lazy.log
@@ -17,25 +17,79 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('plus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('plus': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+}
+
+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@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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
index aafdad4df83..cd09fb2dcaa 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5155WhenBranches.lazy.log
@@ -39,3 +39,31 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+}
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
index 9ec4199510b..3c6767a9d0b 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/kt5182WhenBranches.lazy.log
@@ -18,23 +18,39 @@ LazyJavaPackageFragmentProvider@2 {
     packageFragments('kotlin.jvm': FqName@17) = null
 }
 
-LazyJavaPackageFragment@4['<root>'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
index d378ac5a1b6..997dac76c3f 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastAmbiguitites.lazy.log
@@ -18,22 +18,31 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+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@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
+
+ResolutionTaskHolder@39 {
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[2] { ResolutionCandidate@41, ResolutionCandidate@42 }
 }
diff --git a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
index 4fd35a5cc5c..29b2e1ccaeb 100644
--- a/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
+++ b/compiler/testData/diagnostics/tests/dataFlowInfoTraversal/smartcasts/SmartcastsForStableIdentifiers.lazy.log
@@ -54,3 +54,839 @@ LazyJavaPackageFragment@28['lang'] {
     classes('x': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
     deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@49
 }
+
+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> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[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@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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]
+    <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@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]
+    <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 }
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@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]
+    <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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@46[empty]
+    <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]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@129 {
+    <name not found> = ArrayList@130[1] { ResolutionCandidate@131 }
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@131 }
+    <name not found> = EmptyList@46[empty]
+    <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]
+    <name not found> = EmptyList@46[empty]
+}
+
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
+    <name not found> = EmptyList@46[empty]
+    <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@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@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@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@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@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@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@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[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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@243 {
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@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 699efe6f4e2..b2333625adc 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/ComponentFunctionReturnTypeMismatch.lazy.log
@@ -19,26 +19,26 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+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@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
index 17ac1e04854..6a1e275953a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInMultiDeclInFor.lazy.log
@@ -29,21 +29,52 @@ LazyJavaPackageFragment@11['java'] {
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@13['lang'] {
-    classes('component1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('component2': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('component3': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('hasNext': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('iterator': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('next': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('component1': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('component2': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('component3': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('hasNext': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('iterator': Name@32) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('next': Name@33) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@34) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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@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> = 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[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
+    <name not found> = ArrayList@68[8] { ResolutionCandidate@65, ResolutionCandidate@66, ResolutionCandidate@67, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
index cb747cf255a..6adf0d6dca6 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/DataFlowInfoInMultiDecl.lazy.log
@@ -19,30 +19,71 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('equals': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('component1': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('component2': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('equals': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+}
+
+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@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@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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
index b951647ee1f..94ca4754c04 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/MultiDeclarationErrors.lazy.log
@@ -47,3 +47,117 @@ LazyJavaPackageFragment@18['lang'] {
     functions('use': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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]
+}
+
+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 }
+}
+
+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[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[2] { ResolutionCandidate@79, ResolutionCandidate@80 }
+    <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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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/declarationChecks/RedeclarationsInMultiDecl.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
index 63d10559b5e..7271e4e1e0b 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/RedeclarationsInMultiDecl.lazy.log
@@ -18,33 +18,101 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('component1': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('use': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('A': Name@17) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('component1': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('component2': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('use': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('use': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('use': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component1': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('use': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('A': Name@17) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component1': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('component2': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('use': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('A': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('use': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('A': Name@17) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('use': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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]
+    <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]
+}
+
+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@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 }
+}
+
+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> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
index 433c0c6f631..cff035561de 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/ambiguousObjectExpressionType.lazy.log
@@ -201,46 +201,387 @@ LazyJavaPackageFragmentProvider@98 {
 }
 
 LazyJavaPackageFragment@100['<root>'] {
-    classes('f1': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('f2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo2': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('fooPackageLocal': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateFunction': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateFunctionInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privateProperty': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('privatePropertyInner': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@129 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('f1': Name@120) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('f2': Name@122) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo2': Name@123) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('fooPackageLocal': Name@124) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('privateFunction': Name@125) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('privateFunctionInner': Name@126) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foo2': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('fooPackageLocal': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privateFunction': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privateFunctionInner': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privateProperty': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('privatePropertyInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foo2': Name@120) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('fooPackageLocal': Name@122) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('privateFunction': Name@123) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('privateFunctionInner': Name@124) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@105['java'] {
-    classes('lang': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@129 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('lang': Name@134) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('lang': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('lang': Name@132) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
 LazyJavaPackageFragment@107['lang'] {
-    classes('f1': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('f2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo2': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('fooPackageLocal': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privateFunction': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privateFunctionInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privateProperty': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('privatePropertyInner': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@129 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('f1': Name@120) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('f2': Name@122) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo2': Name@123) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('fooPackageLocal': Name@124) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('privateFunction': Name@125) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('privateFunctionInner': Name@126) = EmptyList@130[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('foo2': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('fooPackageLocal': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privateFunction': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privateFunctionInner': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privateProperty': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('privatePropertyInner': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('foo2': Name@120) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('fooPackageLocal': Name@122) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('privateFunction': Name@123) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('privateFunctionInner': Name@124) = EmptyList@128[empty] // through LazyPackageFragmentScopeForJavaPackage@134
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@134
+}
+
+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]
+    <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 }
+    <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@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]
+    <name not found> = EmptyList@128[empty]
+}
+
+ResolutionTaskHolder@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = EmptyList@128[empty]
+    <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@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> = 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 }
+}
+
+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[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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
index 60f9c475a2c..ad425579d48 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1141.lazy.log
@@ -67,8 +67,14 @@ LazyJavaPackageFragment@45['java'] {
 
 LazyJavaPackageFragment@47['lang'] {
     classes('Runnable': Name@66) = LazyJavaClassDescriptor@4['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('foo': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('foo': Name@68) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
index df2886e891f..0310865fc61 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt1193.lazy.log
@@ -22,3 +22,8 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 9b277468d94..17f13ca672d 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2142.lazy.log
@@ -21,3 +21,12 @@ LazyJavaPackageFragment@7['lang'] {
     functions('Foo': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
index b27e822800b..98fbee8a799 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2631_MultipleDeclaration.lazy.log
@@ -47,9 +47,66 @@ LazyJavaPackageFragment@21['java'] {
 
 LazyJavaPackageFragment@23['lang'] {
     classes('component1': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('component2': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
     deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
     functions('component1': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('component2': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+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@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 }
+}
+
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
index 33d99002b3c..1a9e8172c30 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2643MultiDeclInControlFlow.lazy.log
@@ -24,13 +24,92 @@ LazyJavaPackageFragment@7['java'] {
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('component1': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('component2': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('component1': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('component2': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plus': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
+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@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@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@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@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 }
+}
+
+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> = 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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
index 21fc3442226..09ce50efe3d 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/kt559.lazy.log
@@ -33,11 +33,37 @@ LazyJavaPackageFragment@9['java'] {
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@11['lang'] {
-    classes('fff': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('fff': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('foo': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+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@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@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/declarationChecks/localFunctionNoInheritVisibility.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
index 7f4c610ec21..e9b7f36ea63 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/localFunctionNoInheritVisibility.lazy.log
@@ -25,10 +25,27 @@ LazyJavaPackageFragment@9['java'] {
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('baz': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('zzz': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('zzz': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('baz': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('zzz': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('zzz': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+}
+
+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@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
index 16a37084568..a63f206b45f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/DoubleDeclForLoop.lazy.log
@@ -22,41 +22,60 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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@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@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@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
index 827738b111f..2acac744320 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/FolLoopTypeComponentTypeMismatch.lazy.log
@@ -30,41 +30,60 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Double': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Iterator': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    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@14['lang'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('C': Name@26) = 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@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@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@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/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
index 40255bd4e3d..a77f92cd400 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionAmbiguity.lazy.log
@@ -23,41 +23,60 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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@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@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@55 {
+    <name not found> = ArrayList@56[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[2] { ResolutionCandidate@57, ResolutionCandidate@58 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
index a4f2373343c..c482ed86e9a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopComponentFunctionMissing.lazy.log
@@ -21,41 +21,92 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('component2': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('component2': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('C': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('component2': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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@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> = 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@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]
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
index 16a37084568..7108f82c45c 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForLoopWithExtensions.lazy.log
@@ -24,39 +24,74 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('C': Name@19) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('component1': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('component2': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
index 827738b111f..2acac744320 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/ForWithExplicitTypes.lazy.log
@@ -30,41 +30,60 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Double': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Iterator': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('C': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    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@14['lang'] {
-    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('component2': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('hasNext': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('iterator': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('next': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('C': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component1': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('component2': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('hasNext': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('iterator': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('next': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('C': Name@26) = 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@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@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@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/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
index 16a37084568..a63f206b45f 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/RedeclarationInForLoop.lazy.log
@@ -22,41 +22,60 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('C': Name@19) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component1': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('component2': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('hasNext': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('iterator': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('next': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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@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@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@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
index 0820bc39df4..026dd45b1ea 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/SingleDeclForLoop.lazy.log
@@ -21,37 +21,55 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('hasNext': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('iterator': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('next': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('C': Name@19) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('component1': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('hasNext': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('iterator': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('next': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('hasNext': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('iterator': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('next': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('C': Name@19) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('component1': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('hasNext': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('iterator': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('next': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('C': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('C': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
index 40b268442c9..eae0059e0b8 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/multiDeclarations/kt2829.lazy.log
@@ -49,13 +49,119 @@ LazyJavaPackageFragment@16['lang'] {
     classes('Pair': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('component1': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('component2': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('plus': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('println': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('println': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
     deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
     functions('Pair': Name@43) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     functions('component1': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     functions('component2': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('plus': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('println': Name@48) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('println': Name@47) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <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@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]
+    <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@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 }
+}
+
+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 }
+}
+
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
index 9e6f1a70032..cc85d5ac7ac 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/propertyInPackageHasNoInheritVisibility.lazy.log
@@ -22,9 +22,23 @@ LazyJavaPackageFragment@8['java'] {
 
 LazyJavaPackageFragment@10['lang'] {
     classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
     functions('f': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log b/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
index ffe1cab3105..01acede473a 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/unambiguousObjectExpressionType.lazy.log
@@ -244,76 +244,2540 @@ LazyJavaPackageFragmentProvider@121 {
 }
 
 LazyJavaPackageFragment@123['<root>'] {
-    classes('f1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('foo2': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('fooPackageLocal': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internal2Function': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internal2Property': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internalFunction': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('internalProperty': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('invisible': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packageInternal2Property': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packageInternalProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packagePrivateProperty': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('packagePublic2Property': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('privateFunction': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('privateProperty': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('protected2Function': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('protected2Property': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('public2Function': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('public2Property': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('visible': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@161 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('f1': Name@141) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('foo2': Name@143) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('fooPackageLocal': Name@144) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('internal2Function': Name@145) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('internalFunction': Name@147) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('invisible': Name@149) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('privateFunction': Name@154) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('protected2Function': Name@156) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('public2Function': Name@158) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('visible': Name@160) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('foo2': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('fooPackageLocal': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('internal2Function': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('internal2Property': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('internalFunction': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('internalProperty': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('invisible': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('packageInternal2Property': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('packageInternalProperty': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('packagePrivateProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('packagePublic2Property': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('privateFunction': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('privateProperty': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('protected2Function': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('protected2Property': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('public2Function': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('public2Property': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('foo2': Name@141) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('fooPackageLocal': Name@143) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('internal2Function': Name@144) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('internalFunction': Name@146) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('invisible': Name@148) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('privateFunction': Name@153) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('protected2Function': Name@155) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('public2Function': Name@157) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@142
 }
 
 LazyJavaPackageFragment@127['java'] {
-    classes('lang': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@161 // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('lang': Name@166) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@165
+    classes('lang': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@163
+    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@163
+    functions('lang': Name@164) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@163
+    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@163
 }
 
 LazyJavaPackageFragment@129['lang'] {
-    classes('f1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('foo2': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('fooPackageLocal': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('internal2Function': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('internal2Property': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('internalFunction': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('internalProperty': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('invisible': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('packageInternal2Property': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('packageInternalProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('packagePrivateProperty': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('packagePublic2Property': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('privateFunction': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('privateProperty': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('protected2Function': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('protected2Property': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('public2Function': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('public2Property': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    classes('visible': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@168
-    deserializedPackageScope = Empty@161 // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('f1': Name@141) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('foo2': Name@143) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('fooPackageLocal': Name@144) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('internal2Function': Name@145) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('internalFunction': Name@147) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('invisible': Name@149) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('privateFunction': Name@154) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('protected2Function': Name@156) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('public2Function': Name@158) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    functions('visible': Name@160) = EmptyList@162[empty] // through LazyPackageFragmentScopeForJavaPackage@168
-    memberIndex = computeMemberIndex$1@169 // through LazyPackageFragmentScopeForJavaPackage@168
+    classes('foo2': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('fooPackageLocal': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('internal2Function': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('internal2Property': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('internalFunction': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('internalProperty': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('invisible': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('packageInternal2Property': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('packageInternalProperty': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('packagePrivateProperty': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('packagePublic2Property': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('privateFunction': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('privateProperty': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('protected2Function': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('protected2Property': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('public2Function': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('public2Property': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('foo2': Name@141) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('fooPackageLocal': Name@143) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('internal2Function': Name@144) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('internalFunction': Name@146) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('invisible': Name@148) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('privateFunction': Name@153) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('protected2Function': Name@155) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('public2Function': Name@157) = EmptyList@160[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    memberIndex = computeMemberIndex$1@167 // through LazyPackageFragmentScopeForJavaPackage@166
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@160[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@160[empty]
+    <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]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@284 {
+    <name not found> = ArrayList@285[1] { ResolutionCandidate@286 }
+    <name not found> = ArrayList@287[1] { ResolutionCandidate@286 }
+    <name not found> = EmptyList@160[empty]
+    <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]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@296 {
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@298 }
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@298 }
+    <name not found> = EmptyList@160[empty]
+    <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]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@308 {
+    <name not found> = ArrayList@309[1] { ResolutionCandidate@310 }
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@310 }
+    <name not found> = EmptyList@160[empty]
+    <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]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@320 {
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@322 }
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@322 }
+    <name not found> = EmptyList@160[empty]
+    <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]
+    <name not found> = EmptyList@160[empty]
+}
+
+ResolutionTaskHolder@332 {
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@334 }
+    <name not found> = ArrayList@335[1] { ResolutionCandidate@334 }
+    <name not found> = EmptyList@160[empty]
+    <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@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@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@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@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@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@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@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@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@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@400 {
+    <name not found> = ArrayList@401[1] { ResolutionCandidate@402 }
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@402 }
+}
+
+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@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
+}
+
+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@424 {
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
+}
+
+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@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[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@460 {
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@462 }
+}
+
+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@472 {
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@474 }
+}
+
+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@484 {
+    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@486 }
+}
+
+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@496 {
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@498 }
+}
+
+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@508 {
+    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@510 }
+}
+
+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@520 {
+    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
+}
+
+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@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@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@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@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@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@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@580 {
+    <name not found> = ArrayList@581[1] { ResolutionCandidate@582 }
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@582 }
+}
+
+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@592 {
+    <name not found> = ArrayList@593[1] { ResolutionCandidate@594 }
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@594 }
+}
+
+ResolutionTaskHolder@596 {
+    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
+    <name not found> = ArrayList@599[1] { ResolutionCandidate@598 }
+}
+
+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[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]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@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]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@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]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@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]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@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]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@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]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@774 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@775 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@776 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@777 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@778 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@779 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@780 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@781 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@782 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@783 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@784 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@785 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@786 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@787 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@788 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@789 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@790 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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@791 {
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <name not found> = EmptyList@160[empty]
+    <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 1c8320cffb2..79aafa08b38 100644
--- a/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/declarationChecks/valVarFunctionParameter.lazy.log
@@ -12,26 +12,81 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('get': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('plus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('get': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('plus': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('get': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('plus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('get': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('plus': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+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@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@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@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[8] { ResolutionCandidate@59, ResolutionCandidate@60, ResolutionCandidate@61, ... }
+    <name not found> = ArrayList@62[8] { ResolutionCandidate@59, ResolutionCandidate@60, 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, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
index 0ed8d8d691f..4e08014571e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutInitializer.lazy.log
@@ -25,35 +25,117 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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> = 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@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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 7a75b436ade..714fbf23b1d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/absentErrorAboutType.lazy.log
@@ -29,35 +29,117 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('get': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['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@13['lang'] {
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@30) = 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@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]
+}
+
+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@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@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 }
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 88ace124cf5..3efa2d6452d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/abstractDelegatedProperty.lazy.log
@@ -25,35 +25,163 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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/backingField.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
index f8ebba9283f..8933ec664c1 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/backingField.lazy.log
@@ -30,36 +30,171 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('a': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Delegate': Name@25) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('a': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('Delegate': Name@25) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('a': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@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 }
+    <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@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]
+}
+
+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]
+}
+
+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@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@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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/delegatedPropertyOverridedInTrait.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
index 980ed3c298a..93f06f6a47a 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTrait.lazy.log
@@ -33,38 +33,180 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('PropertyMetadata': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('PropertyMetadataImpl': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('get': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('propertyDelegated': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('AImpl': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Delegate': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('PropertyMetadataImpl': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('get': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('propertyDelegated': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('AImpl': Name@26) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Delegate': Name@29) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('PropertyMetadataImpl': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('equals': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('propertyDelegated': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('AImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('Delegate': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('PropertyMetadataImpl': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('get': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('propertyDelegated': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('AImpl': Name@26) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('Delegate': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('PropertyMetadataImpl': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('equals': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('get': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('propertyDelegated': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('AImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('Delegate': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('PropertyMetadataImpl': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('AImpl': Name@26) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('Delegate': Name@29) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('PropertyMetadataImpl': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('equals': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('propertyDelegated': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+}
+
+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> = 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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+}
+
+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@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> = 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> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
index a68e6104ced..7fdc19230bf 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/delegatedPropertyOverridedInTraitTypeMismatch.lazy.log
@@ -37,38 +37,180 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('PropertyMetadataImpl': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('String': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('get': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('propertyDelegated': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('AImpl': Name@29) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Delegate': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('PropertyMetadataImpl': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('get': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('propertyDelegated': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('propertyDelegated': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('AImpl': Name@29) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('Delegate': Name@32) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('PropertyMetadataImpl': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('propertyDelegated': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('AImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('PropertyMetadataImpl': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('get': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('propertyDelegated': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('AImpl': Name@29) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('Delegate': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('PropertyMetadataImpl': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('equals': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('get': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('propertyDelegated': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('AImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('PropertyMetadataImpl': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('propertyDelegated': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('AImpl': Name@29) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('Delegate': Name@32) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('PropertyMetadataImpl': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('equals': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('propertyDelegated': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+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@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]
+    <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@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]
+    <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@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]
+    <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@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@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]
+    <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/delegatedProperty/genericGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
index 4fee450bcfc..35b5e84940a 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/genericGetter.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
 }
@@ -82,14 +82,14 @@ LazyJavaClassifierType@39['Throwable'] {
 
 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@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -132,38 +132,155 @@ LazyJavaPackageFragment@49['<root>'] {
     classes('PropertyMetadata': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('PropertyMetadataImpl': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('equals': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('get': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('propertyDelegated': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('A': Name@72) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@75) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('PropertyMetadataImpl': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('equals': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('get': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('propertyDelegated': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('propertyDelegated': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('A': Name@72) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@75) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('PropertyMetadataImpl': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('equals': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('propertyDelegated': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('A': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('Exception': Name@75) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('PropertyMetadataImpl': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('equals': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('get': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('propertyDelegated': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('A': Name@72) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('Exception': Name@75) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('PropertyMetadataImpl': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('equals': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('get': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('propertyDelegated': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('A': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('Exception': Name@75) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('PropertyMetadataImpl': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('equals': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('propertyDelegated': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('A': Name@72) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('Exception': Name@75) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('PropertyMetadataImpl': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('equals': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('propertyDelegated': 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> = 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> = 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 }
+    <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@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]
+    <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@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 }
+}
+
+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, ... }
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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@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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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/delegatedProperty/getterWithSubtype.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
index 64e6c6356ec..accac4a7368 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/getterWithSubtype.lazy.log
@@ -28,38 +28,146 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('A': Name@24) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Derived': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('A': Name@24) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('Derived': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@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 }
+    <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@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@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@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[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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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 1f0eba29fda..0d727c2777f 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inTrait.lazy.log
@@ -25,35 +25,163 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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/incompleteTypeInference.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
index 66110a92d5e..e0300b2ccf8 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/incompleteTypeInference.lazy.log
@@ -29,35 +29,228 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('IncorrectThis': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('IncorrectThis': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('PropertyMetadataImpl': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('IncorrectThis': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('IncorrectThis': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('IncorrectThis': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('IncorrectThis': Name@27) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('PropertyMetadataImpl': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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> = 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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@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]
+}
+
+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@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 }
+}
+
+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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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 dd5cf69eb61..6664ccf43bd 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/differentDelegatedExpressions.lazy.log
@@ -78,26 +78,2113 @@ LazyJavaPackageFragment@39['lang'] {
     classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
     classes('get': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('getContainer': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('getMyConcreteProperty': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('getMyProperty': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('minus': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('plus': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('println': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('propertyDelegated': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('set': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('getMyConcreteProperty': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('getMyProperty': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('minus': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('plus': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('println': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('propertyDelegated': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('set': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@74
     deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@74
     functions('MyProperty': Name@73) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     functions('PropertyMetadataImpl': Name@75) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     functions('foo': Name@76) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     functions('get': Name@77) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('getContainer': Name@78) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('getMyConcreteProperty': Name@79) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('getMyProperty': Name@80) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('minus': Name@81) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('plus': Name@82) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('println': Name@83) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('propertyDelegated': Name@84) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('set': Name@85) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('getMyConcreteProperty': Name@78) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('getMyProperty': Name@79) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('minus': Name@80) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('plus': Name@81) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('println': Name@82) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('propertyDelegated': Name@83) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('set': Name@84) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@74
+}
+
+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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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> = 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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@226 {
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@228 }
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@228 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@238 {
+    <name not found> = ArrayList@239[1] { ResolutionCandidate@240 }
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@240 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@262 {
+    <name not found> = ArrayList@263[1] { ResolutionCandidate@264 }
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@264 }
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <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]
+    <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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+ResolutionTaskHolder@499 {
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@504 {
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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 c37f651dd5f..22c774d95a0 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionGet.lazy.log
@@ -40,14 +40,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@21['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,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
 }
@@ -167,3 +167,527 @@ LazyJavaPackageFragment@71['lang'] {
     functions('propertyDelegated': Name@103) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@97
 }
+
+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]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@127 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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@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@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
+    <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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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 }
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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/delegatedProperty/inference/extensionProperty.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
index ee99e58a1de..1760bd7fbdf 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/extensionProperty.lazy.log
@@ -33,7 +33,7 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 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
 }
@@ -159,3 +159,784 @@ LazyJavaPackageFragment@69['lang'] {
     functions('propertyDelegated': Name@97) = EmptyList@90[empty] // through LazyPackageFragmentScopeForJavaPackage@93
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@93
 }
+
+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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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[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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <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@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <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@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@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@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@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> = 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> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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@218 {
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
+    <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 6e79de967ae..3e6a764a80e 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@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@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
 }
@@ -133,35 +133,227 @@ LazyJavaPackageFragment@49['<root>'] {
     classes('PropertyMetadata': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('PropertyMetadataImpl': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('String': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('get': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('propertyDelegated': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('Exception': Name@76) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('MyProperty': Name@77) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('PropertyMetadataImpl': Name@79) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('get': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('propertyDelegated': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('propertyDelegated': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('Exception': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('MyProperty': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('PropertyMetadataImpl': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('propertyDelegated': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@76) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('MyProperty': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('PropertyMetadataImpl': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('get': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('propertyDelegated': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Exception': Name@76) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('MyProperty': Name@77) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('PropertyMetadataImpl': Name@79) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('get': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('propertyDelegated': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('Exception': Name@76) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('MyProperty': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('PropertyMetadataImpl': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('propertyDelegated': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('Exception': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('MyProperty': Name@77) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('PropertyMetadataImpl': Name@79) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('propertyDelegated': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+}
+
+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]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { 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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <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@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[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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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 bdeb2ad09bb..04ebacd2347 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noErrorsForImplicitConstraints.lazy.log
@@ -39,7 +39,7 @@ LazyJavaClassifierType@23['String'] {
 
 LazyJavaClassifierType@26['String'] {
     arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@25['String']
+    classifier = JavaClassImpl@17['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
@@ -53,7 +53,7 @@ LazyJavaClassifierType@29['String'] {
 
 LazyJavaClassifierType@31['String'] {
     arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@17['String']
+    classifier = JavaClassImpl@25['String']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@19
 }
@@ -81,21 +81,21 @@ LazyJavaClassifierType@40['Throwable'] {
 
 LazyJavaClassifierType@43['Throwable'] {
     arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@35['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@28
     typeConstructor = DeserializedClassTypeConstructor@36
 }
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@39['Throwable']
+    classifier = JavaClassImpl@35['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
 }
@@ -182,3 +182,1170 @@ LazyJavaPackageFragment@76['lang'] {
     functions('set': Name@113) = EmptyList@101[empty] // through LazyPackageFragmentScopeForJavaPackage@104
     memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@104
 }
+
+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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <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@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@219 {
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@221 }
+    <name not found> = ArrayList@222[1] { ResolutionCandidate@221 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <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@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@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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@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]
+    <name not found> = EmptyList@101[empty]
+}
+
+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]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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@316 {
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <name not found> = EmptyList@101[empty]
+    <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 541f758a835..9441dac8f49 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/noExpectedTypeForSupertypeConstraint.lazy.log
@@ -37,14 +37,14 @@ 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@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@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
 }
@@ -131,38 +131,260 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('PropertyMetadata': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('get': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('propertyDelegated': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('set': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('Exception': Name@71) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('MyProperty': Name@73) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('PropertyMetadataImpl': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('get': Name@76) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('propertyDelegated': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('set': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('MyProperty': Name@73) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('PropertyMetadataImpl': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('get': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@58['java'] {
-    classes('lang': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('lang': Name@84) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('lang': Name@82) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@60['lang'] {
-    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('MyProperty': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('get': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('propertyDelegated': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('set': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('Exception': Name@71) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('MyProperty': Name@73) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('PropertyMetadataImpl': Name@75) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('get': Name@76) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('propertyDelegated': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('set': Name@78) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('MyProperty': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('PropertyMetadataImpl': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('get': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('Exception': Name@71) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('MyProperty': Name@73) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('PropertyMetadataImpl': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('get': Name@76) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+}
+
+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]
+    <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]
+}
+
+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]
+    <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@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <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@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]
+    <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@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]
+    <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@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@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[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]
+    <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@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, ... }
+    <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 0e90a47f752..7939dfdf750 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useCompleterWithoutExpectedType.lazy.log
@@ -37,14 +37,14 @@ 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@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -165,3 +165,216 @@ LazyJavaPackageFragment@60['lang'] {
     functions('propertyDelegated': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
+
+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]
+    <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]
+    <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@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]
+    <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@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <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]
+}
+
+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]
+    <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@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]
+    <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@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@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]
+}
+
+ResolutionTaskHolder@131 {
+    <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]
+    <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]
+    <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 69f818cefa6..f60468d2e97 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedType.lazy.log
@@ -40,21 +40,21 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@26['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@26['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
 
 LazyJavaClassifierType@32['String'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
@@ -89,14 +89,14 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@36['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@36['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
@@ -193,3 +193,2744 @@ LazyJavaPackageFragment@85['lang'] {
     functions('set': Name@122) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
     memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@111
 }
+
+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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@144 {
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@146 }
+    <name not found> = ArrayList@147[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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@156 {
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@158 }
+    <name not found> = ArrayList@159[1] { ResolutionCandidate@158 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@180 {
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@216 {
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@218 }
+    <name not found> = ArrayList@219[1] { ResolutionCandidate@218 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@228 {
+    <name not found> = ArrayList@229[1] { ResolutionCandidate@230 }
+    <name not found> = ArrayList@231[1] { ResolutionCandidate@230 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@264 {
+    <name not found> = ArrayList@265[1] { ResolutionCandidate@266 }
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@266 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@276 {
+    <name not found> = ArrayList@277[1] { ResolutionCandidate@278 }
+    <name not found> = ArrayList@279[1] { ResolutionCandidate@278 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@288 {
+    <name not found> = ArrayList@289[1] { ResolutionCandidate@290 }
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@290 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@300 {
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@302 }
+    <name not found> = ArrayList@303[1] { ResolutionCandidate@302 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@592 {
+    <name not found> = ArrayList@593[1] { ResolutionCandidate@594 }
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@594 }
+}
+
+ResolutionTaskHolder@596 {
+    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
+    <name not found> = ArrayList@599[1] { ResolutionCandidate@598 }
+}
+
+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, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@740 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@744 {
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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 19e72176ee0..cf3e0ed8df5 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/inference/useExpectedTypeForVal.lazy.log
@@ -40,21 +40,21 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@26['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@23['String']
+    classifier = JavaClassImpl@18['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
 
 LazyJavaClassifierType@32['String'] {
     arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@26['String']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@20
 }
@@ -89,14 +89,14 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@43['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
 
 LazyJavaClassifierType@48['Throwable'] {
     arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@43['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@29
     typeConstructor = DeserializedClassTypeConstructor@37
 }
@@ -191,3 +191,1745 @@ LazyJavaPackageFragment@85['lang'] {
     functions('propertyDelegated': Name@121) = EmptyList@108[empty] // through LazyPackageFragmentScopeForJavaPackage@111
     memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@111
 }
+
+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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@143 {
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@145 }
+    <name not found> = ArrayList@146[1] { ResolutionCandidate@145 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@155 {
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@157 }
+    <name not found> = ArrayList@158[1] { ResolutionCandidate@157 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@167 {
+    <name not found> = ArrayList@168[1] { ResolutionCandidate@169 }
+    <name not found> = ArrayList@170[1] { ResolutionCandidate@169 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@191 {
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@193 }
+    <name not found> = ArrayList@194[1] { ResolutionCandidate@193 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@203 {
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@205 }
+    <name not found> = ArrayList@206[1] { ResolutionCandidate@205 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@215 {
+    <name not found> = ArrayList@216[1] { ResolutionCandidate@217 }
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@217 }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <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> = 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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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@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@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@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@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@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@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@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@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@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@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[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, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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, ... }
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <name not found> = EmptyList@108[empty]
+    <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@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 eba7583d840..d0bc1992330 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/kt4640.lazy.log
@@ -52,3 +52,115 @@ LazyJavaPackageFragment@12['lang'] {
     functions('propertyDelegated': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <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@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]
+    <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]
+    <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@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]
+    <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/delegatedProperty/localVariable.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
index e47053bb7e3..2dcc3b001e7 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/localVariable.lazy.log
@@ -45,3 +45,45 @@ LazyJavaPackageFragment@11['lang'] {
     functions('equals': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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> = 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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
index e9ff84d3771..17d22835fc6 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedGetter.lazy.log
@@ -45,3 +45,96 @@ LazyJavaPackageFragment@9['lang'] {
     functions('propertyDelegated': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <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]
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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 a8b457725e0..1bc2f871ba3 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/missedSetter.lazy.log
@@ -25,39 +25,163 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('A': Name@21) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('A': Name@21) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('set': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('A': Name@21) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('A': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('set': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('A': Name@21) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('propertyDelegated': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('set': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+}
+
+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]
+}
+
+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]
+    <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@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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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@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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 42be60514d2..a85306d78d2 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDefferedType.lazy.log
@@ -44,14 +44,14 @@ LazyJavaClassifierType@24['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['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@20['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -86,14 +86,14 @@ LazyJavaClassifierType@41['Throwable'] {
 
 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@33['Throwable']
+    classifier = JavaClassImpl@37['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -140,41 +140,270 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('PropertyMetadataImpl': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('ag': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('equals': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('get': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('propertyDelegated': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('Delegate': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('Exception': Name@80) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('PropertyMetadataImpl': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('ag': Name@90) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('equals': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('get': Name@86) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('propertyDelegated': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('Delegate': Name@79) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('Exception': Name@80) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('PropertyMetadataImpl': Name@83) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('ag': Name@88) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('equals': Name@85) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('lang': Name@92) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
 LazyJavaPackageFragment@62['lang'] {
-    classes('Delegate': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('Exception': Name@80) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('PropertyMetadataImpl': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('ag': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('equals': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('get': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('propertyDelegated': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('Delegate': Name@79) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('Exception': Name@80) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('PropertyMetadataImpl': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('ag': Name@90) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('equals': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('get': Name@86) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('propertyDelegated': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('Delegate': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Exception': Name@80) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('PropertyMetadataImpl': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('ag': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('equals': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('Delegate': Name@79) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('Exception': Name@80) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('PropertyMetadataImpl': Name@83) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('ag': Name@88) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('equals': Name@85) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
+}
+
+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> = 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]
+    <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@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]
+    <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@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]
+    <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@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@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 }
+}
+
+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]
+    <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@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]
+    <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]
+    <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@146 {
+    <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 267add56232..978b5a31f5a 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedAmbiguity.lazy.log
@@ -29,35 +29,115 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@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 }
+    <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]
+}
+
+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@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@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 }
+}
+
+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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
index 0ed8d8d691f..2bff7aa408d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedIncomplete.lazy.log
@@ -25,35 +25,100 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('Delegate': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('equals': 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@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> = 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@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@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 }
+}
+
+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 }
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
index 0ed8d8d691f..4e08014571e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedMissing.lazy.log
@@ -25,35 +25,117 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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> = 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@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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 0ed8d8d691f..a9ec8bb64a2 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedPrivate.lazy.log
@@ -25,35 +25,132 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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]
+    <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@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@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 }
+}
+
+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/delegatedProperty/propertyDelegatedWrongArguments.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
index 267add56232..29933ed526c 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/propertyDelegatedWrongArguments.lazy.log
@@ -29,35 +29,162 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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> = 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]
+}
+
+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@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 }
+}
+
+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> = 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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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 7a75b436ade..714fbf23b1d 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/publicDelegatedProperty.lazy.log
@@ -29,35 +29,117 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('PropertyMetadata': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('get': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('propertyDelegated': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['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@13['lang'] {
-    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@25) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('PropertyMetadataImpl': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Delegate': Name@25) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@30) = 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@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]
+}
+
+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@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@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 }
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 c3e5d5c1288..ae8c8304ede 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/recursiveType.lazy.log
@@ -39,39 +39,233 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('c': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('d': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('equals': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('get': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('propertyDelegated': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('Delegate': Name@31) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('PropertyMetadataImpl': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('get': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('propertyDelegated': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('Delegate': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('PropertyMetadataImpl': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('equals': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
 LazyJavaPackageFragment@19['lang'] {
-    classes('Delegate': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('PropertyMetadataImpl': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('a': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('b': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('c': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('d': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('equals': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('get': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('propertyDelegated': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('Delegate': Name@31) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('PropertyMetadataImpl': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('equals': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('get': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('propertyDelegated': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('Delegate': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('PropertyMetadataImpl': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('a': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('b': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('c': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('d': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('equals': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('Delegate': Name@31) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('PropertyMetadataImpl': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('equals': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+}
+
+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> = 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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@42[empty]
+}
+
+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@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@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[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> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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/delegatedProperty/redundantGetter.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
index 0ed8d8d691f..4e08014571e 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/redundantGetter.lazy.log
@@ -25,35 +25,117 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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> = 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@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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 420132e5a81..312652b57a8 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/redundantSetter.lazy.log
@@ -25,39 +25,162 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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> = 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]
+    <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 }
+    <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@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@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 }
+}
+
+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[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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 a1831c5b525..365848f16a6 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/setterThisTypeMismatch.lazy.log
@@ -29,39 +29,363 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('set': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Delegate': Name@27) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@31) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('get': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('propertyDelegated': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('set': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('Delegate': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('PropertyMetadataImpl': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('set': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('Delegate': Name@27) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('equals': Name@31) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('get': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('propertyDelegated': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('set': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('Delegate': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('PropertyMetadataImpl': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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> = 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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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]
+    <name not found> = EmptyList@35[empty]
+    <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@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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]
+    <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 }
+    <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> = 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@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@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[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> = 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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@127 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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 24151efd6e0..d5323f79ea9 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/setterWithSupertype.lazy.log
@@ -28,42 +28,191 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('A': Name@24) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Derived': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('set': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('A': Name@24) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('Derived': Name@27) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('get': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('propertyDelegated': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('set': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('A': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Derived': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('A': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Derived': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@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 }
+    <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> = 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]
+    <name not found> = EmptyList@33[empty]
+    <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]
+    <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@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@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> = 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 }
+}
+
+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 {
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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 e56f2c3806b..96b2ff8a916 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisInDelegate.lazy.log
@@ -31,35 +31,354 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('PropertyMetadata': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('equals': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('get': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('propertyDelegated': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('Delegate': Name@26) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('propertyDelegated': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@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 }
+    <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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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@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> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@89 {
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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 e2d8ca32587..b5428774c43 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfAnyType.lazy.log
@@ -26,39 +26,299 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['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@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('Delegate': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+}
+
+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@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]
+    <name not found> = EmptyList@31[empty]
+    <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@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 }
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <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 }
+    <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@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@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@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 }
+}
+
+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 }
+}
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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@126 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 50c62884600..0fc2000e825 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingNullableType.lazy.log
@@ -25,40 +25,353 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['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@12['lang'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('set': Name@30) = 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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@51[1] { ResolutionCandidate@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]
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <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@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@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]
+    <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@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@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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@109 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 50c62884600..31f9974adb6 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/thisOfNothingType.lazy.log
@@ -25,40 +25,409 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Nothing': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['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@12['lang'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@22) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Delegate': Name@22) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('set': Name@30) = 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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@51[1] { ResolutionCandidate@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]
+    <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 {
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <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@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@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]
+    <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@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@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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@109 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 d9f121dd66e..0fe0baad176 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/twoGetMethods.lazy.log
@@ -24,36 +24,211 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('String': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@21) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@21) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@21) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@21) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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[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 }
+}
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@79 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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/typeMismatchForGetReturnType.lazy.log b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
index 31df7dcb509..0d8a5316e3b 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetReturnType.lazy.log
@@ -29,35 +29,117 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('String': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('Delegate': Name@26) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('PropertyMetadataImpl': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('equals': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('get': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('propertyDelegated': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('Delegate': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('PropertyMetadataImpl': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('propertyDelegated': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('Delegate': Name@26) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('PropertyMetadataImpl': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('equals': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('propertyDelegated': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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> = 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]
+}
+
+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@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> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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 c7e414c9b5b..1b3b6b90111 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForGetWithGeneric.lazy.log
@@ -35,36 +35,465 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Nothing': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('PropertyMetadata': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('PropertyMetadataImpl': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('get': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('Delegate': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('PropertyMetadataImpl': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('equals': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('get': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('get': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('propertyDelegated': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('Delegate': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('PropertyMetadataImpl': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('get': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('propertyDelegated': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('PropertyMetadataImpl': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('equals': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('get': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('propertyDelegated': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('Delegate': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('PropertyMetadataImpl': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('equals': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('get': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('propertyDelegated': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('Delegate': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('PropertyMetadataImpl': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('get': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('propertyDelegated': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('Delegate': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('PropertyMetadataImpl': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('get': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('propertyDelegated': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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]
+    <name not found> = EmptyList@41[empty]
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <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]
+    <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 }
+    <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@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]
+    <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@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <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 }
+    <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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 594a6d066b3..674669efac2 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForSetParameter.lazy.log
@@ -30,39 +30,369 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('get': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('set': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Delegate': Name@27) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('get': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('propertyDelegated': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('set': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('set': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('Delegate': Name@27) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('PropertyMetadataImpl': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('propertyDelegated': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('set': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('get': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('set': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('Delegate': Name@27) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('PropertyMetadataImpl': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('equals': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('get': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('propertyDelegated': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('set': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('Delegate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('PropertyMetadataImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('propertyDelegated': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('set': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('Delegate': Name@27) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('PropertyMetadataImpl': Name@30) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('equals': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('propertyDelegated': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('set': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+}
+
+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> = 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> = 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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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> = 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]
+    <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@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]
+    <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@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@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> = 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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@131 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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 535054bafbe..8917a023cb3 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/typeMismatchForThisGetParameter.lazy.log
@@ -24,36 +24,289 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@22) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@22) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Delegate': Name@22) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('get': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('propertyDelegated': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Delegate': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('get': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@22) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('get': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+}
+
+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@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 }
+}
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 39871343874..ee234e7ab76 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInGet.lazy.log
@@ -58,3 +58,271 @@ LazyJavaPackageFragment@12['lang'] {
     functions('propertyDelegated': Name@30) = 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@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]
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@62[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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <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@75 {
+    <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]
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 e2d8ca32587..2f4da7cb111 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/wrongCountOfParametersInSet.lazy.log
@@ -26,39 +26,374 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('Delegate': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['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@12['lang'] {
-    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('propertyDelegated': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Delegate': Name@24) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('PropertyMetadataImpl': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@28) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('get': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('propertyDelegated': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Delegate': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('PropertyMetadataImpl': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Delegate': Name@24) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('PropertyMetadataImpl': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('set': Name@30) = 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@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]
+}
+
+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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 }
+    <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]
+    <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@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]
+    <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@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@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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@131 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 320b2265c5d..9e31a6ae850 100644
--- a/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegatedProperty/wrongSetterReturnType.lazy.log
@@ -25,39 +25,157 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('PropertyMetadata': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('propertyDelegated': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('set': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Delegate': Name@23) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('PropertyMetadataImpl': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('propertyDelegated': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('set': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Delegate': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('PropertyMetadataImpl': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('propertyDelegated': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Delegate': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('PropertyMetadataImpl': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('equals': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('propertyDelegated': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+}
+
+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> = 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]
+    <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 }
+    <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@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@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 }
+}
+
+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[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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 9f5c6138372..bd65f4b75bf 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationAndOverriding.lazy.log
@@ -42,3 +42,43 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
 }
+
+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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
index 3852b4adc31..e970931aa66 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationExpectedType.lazy.log
@@ -36,34 +36,112 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('baz': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('boo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('AImpl': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('bar': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('baz': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('boo': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('AImpl': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('bar': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('baz': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('boo': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('AImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('baz': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('boo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('AImpl': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('bar': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('baz': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('boo': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('plus': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('AImpl': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('baz': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('boo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('AImpl': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('bar': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('baz': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('boo': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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]
+    <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]
+    <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]
+    <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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
index e9bf2172bd9..c92dcdd741c 100644
--- a/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/DelegationNotTotrait.lazy.log
@@ -39,3 +39,22 @@ LazyJavaPackageFragment@12['lang'] {
     functions('Foo': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
diff --git a/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log b/compiler/testData/diagnostics/tests/delegation/DelegationToJavaIface.lazy.log
index c556791296e..ada6b13e086 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@86['Object']
+    classifier = JavaClassImpl@90['Object']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@87
 }
 
 LazyJavaClassifierType@93['Object'] {
     arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@90['Object']
+    classifier = JavaClassImpl@86['Object']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@87
 }
@@ -161,3 +161,13 @@ LazyJavaTypeParameterDescriptor@69['T'] {
 LazyJavaTypeParameterResolver@134 {
     resolve(JavaTypeParameterImpl@135['T']) = LazyJavaTypeParameterDescriptor@69['T']
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
index 02ebeae9fe7..bcc8c0acfc9 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_ClashingFunctions.lazy.log
@@ -39,3 +39,93 @@ LazyJavaPackageFragment@15['java'] {
     functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
 }
+
+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> = 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@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 }
+}
+
+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 }
+}
+
+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[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> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
index 4e08690ead8..8123e6e1437 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_Hierarchy.lazy.log
@@ -16,23 +16,34 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@18) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
index 03ef5cb5114..d1f31868fd9 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_MultipleDelegates.lazy.log
@@ -41,3 +41,18 @@ LazyJavaPackageFragment@14['java'] {
     functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+}
diff --git a/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log b/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
index a2e73c76bdb..fab4def36c0 100644
--- a/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
+++ b/compiler/testData/diagnostics/tests/delegation/Delegation_ScopeInitializationOrder.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+    <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 f861dc53806..e3afc0d0352 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/deparenthesize/ArrayAccessAssignment.lazy.log
@@ -23,9 +23,12 @@ LazyJavaPackageFragment@6['java'] {
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
index 365c92384df..bd53bf98f86 100644
--- a/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/deparenthesize/checkDeparenthesizedType.lazy.log
@@ -42,3 +42,190 @@ LazyJavaPackageFragment@12['lang'] {
     functions('use': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = ArrayList@59[1] { ResolutionCandidate@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]
+}
+
+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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+}
+
+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@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[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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
index 33eb8497a9b..31a991b4919 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByProperty.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 33eb8497a9b..31a991b4919 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyInConstructor.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 1009968f94d..ab94ec3a49c 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classFunctionOverriddenByPropertyNoGetter.lazy.log
@@ -29,3 +29,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <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 33eb8497a9b..31a991b4919 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/classPropertyOverriddenByFunction.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 1fa1204a241..cc697e29a05 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/defaultFunction.lazy.log
@@ -26,3 +26,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 f9f3dcab31c..c4a88889b64 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/delegatedFunctionOverriddenByProperty.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <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 409cbb76358..9507dee98df 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/genericClassFunction.lazy.log
@@ -32,3 +32,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <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 14dc9d2b83e..852155d6ce1 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/phantomClashWithSamAdapter.lazy.log
@@ -104,3 +104,13 @@ LazyJavaPackageFragment@73['p'] {
     classes('Foo': Name@78) = LazyJavaClassDescriptor@0['Foo'] // through LazyPackageFragmentScopeForJavaPackage@89
     classes('Unit': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
index 33eb8497a9b..31a991b4919 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/accidentalOverrides/privateClassFunctionOverriddenByProperty.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 d28d33a5c4f..a53f0278720 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/bridges/class.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <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 4d0b877b90f..b22b73c7d28 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegateToTwoTraits.lazy.log
@@ -38,3 +38,13 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
index 332b9acf146..11f0a174d7a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/delegationAndOwnMethod.lazy.log
@@ -35,3 +35,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <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 3ea1f7c5394..edb66f3efc9 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/genericType.lazy.log
@@ -27,3 +27,13 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
index b16b18bd0f6..fc91f67701a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameter.lazy.log
@@ -23,3 +23,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
index 9df43193fb3..691c9c33be5 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithBound.lazy.log
@@ -19,3 +19,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
index bf51b734e7f..56ae7dff25b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBounds.lazy.log
@@ -22,3 +22,18 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
index bf51b734e7f..56ae7dff25b 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/erasure/typeParameterWithTwoBoundsInWhere.lazy.log
@@ -22,3 +22,18 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@35 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
index e2590efed44..af9b4ad8937 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/functionAndProperty/privateClassPropertyNoClash.lazy.log
@@ -78,3 +78,15 @@ LazyJavaPackageFragment@53['lang'] {
     classes('foo': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@71
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
index e5723e8a07b..08817952726 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObject.lazy.log
@@ -26,3 +26,26 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
index 436d9d0fc0c..8bdbb57b839 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/classObjectCopiedFieldObject.lazy.log
@@ -27,3 +27,26 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
index 709ebd08ece..cc8f6d6890f 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/dataClassCopy.lazy.log
@@ -47,3 +47,34 @@ LazyJavaPackageFragment@14['lang'] {
     functions('C': Name@24) = 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@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]
+    <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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
index 90bfec41bee..821fdf9753c 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/delegationBy.lazy.log
@@ -21,3 +21,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+ResolutionTaskHolder@22 {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+    <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 cc5c5101989..7477439cc2a 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/enum.lazy.log
@@ -27,3 +27,13 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
index 1b0a9b55d08..4b97268efe5 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/instance.lazy.log
@@ -16,3 +16,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
     memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
+
+ResolutionTaskHolder@19 {
+    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
+    <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 0938a0b0b32..d1dbf5bf2ac 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/specialNames/propertyMetadataCache.lazy.log
@@ -55,3 +55,174 @@ LazyJavaPackageFragment@13['lang'] {
     functions('propertyDelegated': Name@30) = 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@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]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@51[1] { ResolutionCandidate@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]
+}
+
+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]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+}
diff --git a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
index 1da64fe6473..36352a1f968 100644
--- a/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
+++ b/compiler/testData/diagnostics/tests/duplicateJvmSignature/synthesized/enumValuesValueOf.lazy.log
@@ -43,3 +43,27 @@ LazyJavaPackageFragment@12['lang'] {
     functions('valueOf': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
+
+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]
+    <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 648e15d08be..4ccf73cc3e2 100644
--- a/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/AbstractInEnum.lazy.log
@@ -36,3 +36,93 @@ LazyJavaPackageFragment@15['lang'] {
     classes('i': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <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@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]
+    <name not found> = EmptyList@25[empty]
+}
+
+ResolutionTaskHolder@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+    <name not found> = EmptyList@25[empty]
+    <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]
+    <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@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <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 eb8b7de486b..a210312e687 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnum.lazy.log
@@ -16,22 +16,59 @@ LazyJavaPackageFragmentProvider@2 {
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    classes('entry': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('entry': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('entry': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('entry': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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]
+    <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 }
+    <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 626457b4526..5d5adda7d8f 100644
--- a/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/classObjectInEnumPrivate.lazy.log
@@ -41,3 +41,114 @@ LazyJavaPackageFragment@11['lang'] {
     functions('values': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@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]
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@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]
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log b/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
index 0e03f6d7239..f2f3c84b824 100644
--- a/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/commonSupertype.lazy.log
@@ -32,3 +32,48 @@ LazyJavaPackageFragment@8['java'] {
 LazyJavaPackageFragment@10['lang'] {
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+    <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@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]
+}
+
+ResolutionTaskHolder@40 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 01d2deea46a..0029e6fd936 100644
--- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.lazy.log
@@ -55,3 +55,298 @@ LazyJavaPackageFragment@13['lang'] {
     functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+}
+
+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> = 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]
+}
+
+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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <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]
+    <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 }
+    <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 }
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+}
+
+ResolutionTaskHolder@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]
+    <name not found> = EmptyList@30[empty]
+}
+
+ResolutionTaskHolder@114 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 5eb9d9b8342..c423bc413c1 100644
--- a/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/entryShouldBeOfEnumType.lazy.log
@@ -24,3 +24,48 @@ LazyJavaPackageFragment@5['java'] {
 LazyJavaPackageFragment@7['lang'] {
     deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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]
+    <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@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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 8ba25e06aa3..bb39d73de41 100644
--- a/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumEntryCannotHaveClassObject.lazy.log
@@ -35,3 +35,104 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@16) = 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> = ArrayList@30[1] { ResolutionCandidate@29 }
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 6ccd0926224..23484a4f1ed 100644
--- a/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumInheritance.lazy.log
@@ -25,3 +25,16 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
index ac6b4f9fbdb..ffc5f598777 100644
--- a/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumIsAssignableToBuiltInEnum.lazy.log
@@ -102,3 +102,63 @@ LazyJavaPackageFragment@43['lang'] {
     functions('annotation': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@13[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@92 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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 acc48972375..fe152fcdc40 100644
--- a/compiler/testData/diagnostics/tests/enum/enumStarImport.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/enumStarImport.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
 }
@@ -144,3 +144,40 @@ LazyJavaPackageFragment@60['lang'] {
     functions('UnsupportedOperationException': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@81
     memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
+
+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]
+}
+
+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@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, ... }
+    <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 7a0b46282fc..a4f6e0c8f49 100644
--- a/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/extensionNamedAsEnumEntry.lazy.log
@@ -38,3 +38,23 @@ LazyJavaPackageFragment@11['java'] {
 LazyJavaPackageFragment@13['lang'] {
     deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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/importEnumFromJava.lazy.log b/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
index 565e9cb2e41..e6fb81413ae 100644
--- a/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/importEnumFromJava.lazy.log
@@ -90,3 +90,10 @@ LazyJavaPackageFragment@39['util'] {
     functions('concurrent': Name@63) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@62
     memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
index dad8263c20f..753bc121839 100644
--- a/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/inheritanceFromEnum.lazy.log
@@ -83,3 +83,21 @@ LazyJavaPackageFragment@64['java'] {
     functions('lang': Name@82) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
 }
+
+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@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+}
diff --git a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
index 189852ff0bd..e7b9f57d03e 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValueOfMethod.lazy.log
@@ -66,3 +66,30 @@ LazyJavaPackageFragment@33['java'] {
 LazyJavaPackageFragment@35['lang'] {
     deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@49
 }
+
+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]
+    <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]
+    <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/enum/javaEnumValuesMethod.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
index 6e1476dac6f..7e3ff69e1da 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumValuesMethod.lazy.log
@@ -70,3 +70,30 @@ LazyJavaPackageFragment@34['java'] {
 LazyJavaPackageFragment@36['lang'] {
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
 }
+
+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]
+    <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]
+    <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/enum/javaEnumWithAbstractFun.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
index 9dba2f385fb..6a82f570bce 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithAbstractFun.lazy.log
@@ -86,22 +86,49 @@ LazyJavaPackageFragmentProvider@49 {
 LazyJavaPackageFragment@51['<root>'] {
     classes('A': Name@66) = LazyJavaClassDescriptor@14['A'] // through LazyPackageFragmentScopeForJavaPackage@67
     classes('String': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('s': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@67
     deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('s': Name@2) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('lang': Name@72) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('s': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('s': Name@2) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@74
+}
+
+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]
+    <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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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/enum/javaEnumWithFuns.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
index af69810b688..74359759881 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithFuns.lazy.log
@@ -17,7 +17,6 @@ LazyJavaClassDescriptor@4['A'] {
     nestedClasses('s': Name@8) = null // through LazyJavaClassMemberScope@7
     properties('ENTRY': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
     properties('ENTRY': Name@15) = EmptyList@16[empty] // through LazyJavaStaticClassScope@13
-    properties('s': Name@8) = EmptyList@16[empty] // through LazyJavaClassMemberScope@7
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@18['A']
 }
@@ -77,22 +76,46 @@ LazyJavaPackageFragmentProvider@40 {
 
 LazyJavaPackageFragment@42['<root>'] {
     classes('A': Name@54) = LazyJavaClassDescriptor@4['A'] // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('s': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@55
     deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('s': Name@8) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('lang': Name@59) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    classes('s': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('s': Name@8) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@61
+}
+
+ResolutionTaskHolder@62 {
+    <name not found> = ArrayList@63[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+    <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]
+    <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 2be40355dd6..66516605074 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithNameClashing.lazy.log
@@ -105,3 +105,62 @@ LazyJavaPackageFragment@58['java'] {
 LazyJavaPackageFragment@60['lang'] {
     deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@77
 }
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+    <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@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]
+    <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@101 {
+    <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/javaEnumWithProperty.lazy.log b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
index e61f6a50ca4..f96be977fc1 100644
--- a/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/javaEnumWithProperty.lazy.log
@@ -103,3 +103,62 @@ LazyJavaPackageFragment@58['java'] {
 LazyJavaPackageFragment@60['lang'] {
     deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@74
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@27[empty]
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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/enum/kt2834.lazy.log b/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
index b6ad622ad9e..a0bd2a09d7e 100644
--- a/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/kt2834.lazy.log
@@ -15,22 +15,61 @@ LazyJavaPackageFragmentProvider@2 {
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('equals': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('equals': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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 }
+}
+
+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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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/localEnums.lazy.log b/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
index 070bc4cb656..98c625417a0 100644
--- a/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/localEnums.lazy.log
@@ -28,3 +28,23 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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/overrideFinalEnumMethods.lazy.log b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
index 13f6b827d69..febf2c0f5af 100644
--- a/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/overrideFinalEnumMethods.lazy.log
@@ -29,22 +29,21 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Any': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
-LazyJavaPackageFragment@13['lang'] {
-    classes('minus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('minus': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
index b31ae3834fc..afb396b4f8f 100644
--- a/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/starImportNestedClassAndEntries.lazy.log
@@ -32,11 +32,66 @@ LazyJavaPackageFragment@14['java'] {
 
 LazyJavaPackageFragment@16['lang'] {
     classes('Nested': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('values': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('values': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
     deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
     functions('Nested': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('values': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('values': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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]
+    <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]
+    <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@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <name not found> = ArrayList@43[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]
+}
+
+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]
+    <name not found> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <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 2421e302ee8..6cd3cc53433 100644
--- a/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/typeParametersInEnum.lazy.log
@@ -22,3 +22,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 6e233de537f..5ce27ed771e 100644
--- a/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/enum/valuesValueOfAndEntriesAccessibility.lazy.log
@@ -45,3 +45,479 @@ LazyJavaPackageFragment@11['lang'] {
     functions('values': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = 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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = ArrayList@53[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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = 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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <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]
+    <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 }
+    <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 0c60c59ed80..23cb438c86c 100644
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/binaryMinusDepOnExpType.lazy.log
@@ -35,50 +35,578 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toByte': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toInt': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toLong': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toShort': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@33) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('minus': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toByte': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toInt': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toLong': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toShort': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toByte': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toInt': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toLong': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toShort': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooByte': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooInt': Name@33) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooLong': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooShort': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('minus': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toByte': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toInt': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toLong': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toShort': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@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]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <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]
+    <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@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@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@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@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@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@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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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[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@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, ... }
+}
+
+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@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@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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
index 7e4acfba4c6..bde3a0a75e8 100644
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndepWoExpType.lazy.log
@@ -50,60 +50,635 @@ LazyJavaPackageFragment@14['<root>'] {
     classes('fooInt': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('fooLong': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('fooShort': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('minus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p3': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p4': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('p5': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toByte': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toInt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toLong': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('toShort': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooByte': Name@44) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooInt': Name@45) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooLong': Name@46) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('fooShort': Name@47) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('minus': Name@48) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toByte': Name@54) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toInt': Name@55) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toLong': Name@56) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('toShort': Name@57) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('p1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('p2': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('p3': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('p4': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('p5': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('fooByte': Name@44) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('fooInt': Name@45) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('fooLong': Name@46) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('fooShort': Name@47) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@63) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('lang': Name@58) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
 LazyJavaPackageFragment@22['lang'] {
-    classes('fooByte': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('fooInt': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('fooLong': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('fooShort': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('minus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p3': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p4': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p5': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('toByte': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('toInt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('toLong': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('toShort': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooByte': Name@44) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooInt': Name@45) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooLong': Name@46) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('fooShort': Name@47) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('minus': Name@48) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('toByte': Name@54) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('toInt': Name@55) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('toLong': Name@56) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('toShort': Name@57) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('fooByte': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('fooInt': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('fooLong': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('fooShort': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('p1': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('p2': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('p3': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('p4': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('p5': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('fooByte': Name@44) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('fooInt': Name@45) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('fooLong': Name@46) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('fooShort': Name@47) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
+}
+
+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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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> = 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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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> = ArrayList@109[1] { ResolutionCandidate@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@54[empty]
+    <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]
+    <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
+    <name not found> = EmptyList@54[empty]
+    <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]
+    <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@154 {
+    <name not found> = ArrayList@155[1] { ResolutionCandidate@156 }
+    <name not found> = ArrayList@157[1] { ResolutionCandidate@156 }
+    <name not found> = EmptyList@54[empty]
+    <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]
+    <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@166 {
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@168 }
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@168 }
+    <name not found> = EmptyList@54[empty]
+    <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]
+    <name not found> = EmptyList@54[empty]
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@54[empty]
+    <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@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@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@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@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]
+}
+
+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@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@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@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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
index f52446db668..36ff48e0823 100644
--- a/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/binaryMinusIndependentExpType.lazy.log
@@ -67,38 +67,191 @@ LazyJavaPackageFragment@23['<root>'] {
     classes('Int': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('Long': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('Short': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('minus': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('toByte': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('toInt': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('toLong': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('toShort': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('minus': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('toByte': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('toInt': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('toLong': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('toShort': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('lang': Name@71) = EmptyList@72[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@39['lang'] {
-    classes('minus': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('toByte': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('toInt': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('toLong': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('toShort': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('minus': Name@68) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('toByte': Name@69) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('toInt': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('toLong': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('toShort': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
+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 }
+}
+
+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[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> = 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[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[8] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
+    <name not found> = ArrayList@143[8] { ResolutionCandidate@140, ResolutionCandidate@141, ResolutionCandidate@142, ... }
+}
+
+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@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> = ArrayList@157[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+    <name not found> = ArrayList@161[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+}
+
+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@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, ... }
+}
+
+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, ... }
+}
+
+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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
index c1905a142f8..71de135cf2c 100644
--- a/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/intOverflow.lazy.log
@@ -56,42 +56,1096 @@ LazyJavaPackageFragmentProvider@21 {
 
 LazyJavaPackageFragment@23['<root>'] {
     classes('Int': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('div': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('intMaxValue': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('intMinValue': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('minus': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('plus': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('shl': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('times': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('div': Name@57) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('minus': Name@60) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('plus': Name@61) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('shl': Name@62) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('times': Name@63) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('intMaxValue': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('intMinValue': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
 LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('lang': Name@69) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('lang': Name@62) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@45['lang'] {
-    classes('div': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('intMaxValue': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('intMinValue': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('minus': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('plus': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('shl': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('times': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('div': Name@57) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('minus': Name@60) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('plus': Name@61) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('shl': Name@62) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('times': Name@63) = EmptyList@65[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('intMaxValue': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('intMinValue': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@65
+}
+
+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> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[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 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@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> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+}
+
+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@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@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> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[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 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+    <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]
+    <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 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@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> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[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@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <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]
+    <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@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@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <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]
+    <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@220 {
+    <name not found> = ArrayList@221[1] { ResolutionCandidate@222 }
+    <name not found> = ArrayList@223[1] { ResolutionCandidate@222 }
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@243 {
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@245 }
+    <name not found> = ArrayList@246[1] { ResolutionCandidate@245 }
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@267 {
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@269 }
+    <name not found> = ArrayList@270[1] { ResolutionCandidate@269 }
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@279 {
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@281 }
+    <name not found> = ArrayList@282[1] { ResolutionCandidate@281 }
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@291 {
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@293 }
+    <name not found> = ArrayList@294[1] { ResolutionCandidate@293 }
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@303 {
+    <name not found> = ArrayList@304[1] { ResolutionCandidate@305 }
+    <name not found> = ArrayList@306[1] { ResolutionCandidate@305 }
+    <name not found> = EmptyList@63[empty]
+    <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]
+    <name not found> = EmptyList@63[empty]
+}
+
+ResolutionTaskHolder@315 {
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@317 }
+    <name not found> = ArrayList@318[1] { ResolutionCandidate@317 }
+    <name not found> = EmptyList@63[empty]
+    <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@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]
+}
+
+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@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@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@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]
+}
+
+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@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@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@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]
+}
+
+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@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@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@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]
+}
+
+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@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@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@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]
+}
+
+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[7] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
+    <name not found> = ArrayList@420[7] { ResolutionCandidate@417, ResolutionCandidate@418, ResolutionCandidate@419, ... }
+}
+
+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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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, ... }
+}
+
+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@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@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@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@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@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@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@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@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@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@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@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@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@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@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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log b/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
index fa58a5e66c7..0bb55cef038 100644
--- a/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/intOverflowWithJavaProperties.lazy.log
@@ -62,25 +62,109 @@ LazyJavaPackageFragmentProvider@36 {
 LazyJavaPackageFragment@38['<root>'] {
     classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('Test': Name@59) = LazyJavaClassDescriptor@3['Test'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('plus': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('Test': Name@62) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('plus': Name@60) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('Test': Name@61) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('lang': Name@65) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('Test': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('plus': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Test': Name@62) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('plus': Name@60) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Test': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('Test': Name@61) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@67
+}
+
+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]
+    <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@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@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { 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@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@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> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@118 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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/evaluate/longOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
index ce23cbe441b..325810e99fd 100644
--- a/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/longOverflow.lazy.log
@@ -62,48 +62,971 @@ LazyJavaPackageFragmentProvider@22 {
 LazyJavaPackageFragment@24['<root>'] {
     classes('Int': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
     classes('Long': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('div': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('intMinValue': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('longMaxValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('longMinValue': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('minus': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('plus': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('shl': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('times': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toLong': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('div': Name@63) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('minus': Name@67) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('plus': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('shl': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('times': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('toLong': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('intMinValue': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('longMaxValue': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('longMinValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('lang': Name@69) = EmptyList@70[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
 LazyJavaPackageFragment@34['lang'] {
-    classes('div': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('intMinValue': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('longMaxValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('longMinValue': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('minus': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('plus': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('shl': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('times': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('toLong': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('div': Name@63) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('minus': Name@67) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('plus': Name@68) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('shl': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('times': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('toLong': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('intMinValue': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('longMaxValue': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('longMinValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@72
+}
+
+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> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+    <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> = 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 }
+    <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]
+    <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 }
+    <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@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> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <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> = 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 }
+    <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]
+    <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 }
+    <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@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> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+    <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> = 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 }
+    <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]
+    <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]
+    <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]
+    <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@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@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]
+    <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]
+    <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@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@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]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@217 {
+    <name not found> = ArrayList@218[1] { ResolutionCandidate@219 }
+    <name not found> = ArrayList@220[1] { ResolutionCandidate@219 }
+    <name not found> = EmptyList@70[empty]
+    <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]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+    <name not found> = EmptyList@70[empty]
+    <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]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@241 {
+    <name not found> = ArrayList@242[1] { ResolutionCandidate@243 }
+    <name not found> = ArrayList@244[1] { ResolutionCandidate@243 }
+    <name not found> = EmptyList@70[empty]
+    <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]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+    <name not found> = EmptyList@70[empty]
+    <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]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@265 {
+    <name not found> = ArrayList@266[1] { ResolutionCandidate@267 }
+    <name not found> = ArrayList@268[1] { ResolutionCandidate@267 }
+    <name not found> = EmptyList@70[empty]
+    <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]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+    <name not found> = EmptyList@70[empty]
+    <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]
+    <name not found> = EmptyList@70[empty]
+}
+
+ResolutionTaskHolder@289 {
+    <name not found> = ArrayList@290[1] { ResolutionCandidate@291 }
+    <name not found> = ArrayList@292[1] { ResolutionCandidate@291 }
+    <name not found> = EmptyList@70[empty]
+    <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]
+    <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@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@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@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@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@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]
+}
+
+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@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@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@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]
+}
+
+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@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@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@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]
+}
+
+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@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@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 }
+}
+
+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[7] { ResolutionCandidate@423, ResolutionCandidate@424, ResolutionCandidate@425, ... }
+    <name not found> = ArrayList@426[7] { ResolutionCandidate@423, ResolutionCandidate@424, ResolutionCandidate@425, ... }
+}
+
+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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
index 88a542f96bc..b9c12da3536 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperations.lazy.log
@@ -31,50 +31,278 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('div': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('mod': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('div': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('mod': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('times': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('div': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooByte': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooLong': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooShort': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('mod': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('plus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('div': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooByte': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooInt': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooLong': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooShort': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('mod': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('plus': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('times': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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 {
+    <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]
+    <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]
+}
+
+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@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@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 }
+}
+
+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[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@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@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@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@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@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@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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
index 88a542f96bc..b9c12da3536 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsCall.lazy.log
@@ -31,50 +31,278 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('div': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('mod': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('div': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('mod': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('times': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('div': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooByte': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooLong': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooShort': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('mod': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('plus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('div': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooByte': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooInt': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooLong': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooShort': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('mod': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('plus': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('times': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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 {
+    <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]
+    <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]
+}
+
+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@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@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 }
+}
+
+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[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@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@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@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@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@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@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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
index 88a542f96bc..b9c12da3536 100644
--- a/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/numberBinaryOperationsInfixCall.lazy.log
@@ -31,50 +31,278 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('Int': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('Long': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('Short': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('div': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooByte': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooLong': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('fooShort': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('mod': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('div': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('mod': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('times': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('div': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooByte': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooLong': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('fooShort': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('mod': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('plus': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('div': Name@32) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooByte': Name@33) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooInt': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooLong': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('fooShort': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('mod': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('plus': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('times': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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 {
+    <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]
+    <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]
+}
+
+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@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@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 }
+}
+
+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[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@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@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@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@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@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@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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log b/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
index 358594b8f19..5c58df20797 100644
--- a/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/otherOverflow.lazy.log
@@ -19,30 +19,81 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('times': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('toByte': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('toShort': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('times': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('toByte': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('toShort': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    classes('times': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('toByte': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('toShort': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('times': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('toByte': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('toShort': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+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@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@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@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[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+    <name not found> = ArrayList@63[7] { ResolutionCandidate@60, ResolutionCandidate@61, ResolutionCandidate@62, ... }
+}
+
+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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log b/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
index 97736af4e9c..70ebdd5d0a6 100644
--- a/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/parentesized.lazy.log
@@ -47,42 +47,141 @@ LazyJavaPackageFragment@13['<root>'] {
     classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('Long': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('Short': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('times': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toByte': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toInt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toLong': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toShort': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('plus': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('times': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toByte': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toInt': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toLong': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toShort': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@25['java'] {
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@51) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
-LazyJavaPackageFragment@27['lang'] {
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('times': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toByte': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toInt': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toLong': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toShort': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('plus': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('times': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('toByte': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('toInt': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('toLong': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('toShort': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
+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[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> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { 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@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@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, ... }
+}
+
+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@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, ... }
+}
+
+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@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, ... }
+}
+
+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@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@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> = ArrayList@157[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+    <name not found> = ArrayList@161[8] { ResolutionCandidate@158, ResolutionCandidate@159, ResolutionCandidate@160, ... }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log b/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
index 64a7eeba8dc..7237049f3bd 100644
--- a/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/qualifiedExpressions.lazy.log
@@ -35,3 +35,48 @@ LazyJavaPackageFragment@16['lang'] {
     classes('ns': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
     deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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]
+    <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@44 {
+    <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@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]
+}
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
index 0c60c59ed80..90a691a2ef3 100644
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/unaryMinusDepOnExpType.lazy.log
@@ -35,50 +35,714 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toByte': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toInt': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toLong': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('toShort': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooByte': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooInt': Name@33) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooLong': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('fooShort': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('minus': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toByte': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toInt': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toLong': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('toShort': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('minus': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toByte': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toInt': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toLong': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toShort': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooByte': Name@32) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooInt': Name@33) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooLong': Name@34) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('fooShort': Name@35) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('minus': Name@36) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toByte': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toInt': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toLong': Name@39) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toShort': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('fooByte': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooInt': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooLong': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('fooShort': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooByte': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooInt': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooLong': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('fooShort': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@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]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <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]
+    <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@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]
+    <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]
+    <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@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@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@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@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@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@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@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@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 }
+}
+
+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 }
+}
+
+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[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[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, ... }
+}
+
+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, ... }
+}
+
+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@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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
index 78cf21b10a6..eef762052c3 100644
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndepWoExpType.lazy.log
@@ -53,62 +53,748 @@ LazyJavaPackageFragment@17['<root>'] {
     classes('fooInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('fooLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('fooShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('minus': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p1': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p2': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p3': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p4': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p5': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p6': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toByte': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toInt': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toLong': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('toShort': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooByte': Name@48) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooInt': Name@49) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooLong': Name@50) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('fooShort': Name@51) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('minus': Name@52) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toByte': Name@59) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toInt': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toLong': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('toShort': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p1': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p3': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p4': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p5': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p6': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('fooByte': Name@48) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('fooInt': Name@49) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('fooLong': Name@50) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('fooShort': Name@51) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('lang': Name@63) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('fooByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('fooInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('fooLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('fooShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('minus': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p1': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p2': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p3': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p4': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p5': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('p6': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('toByte': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('toInt': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('toLong': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('toShort': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('fooByte': Name@48) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('fooInt': Name@49) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('fooLong': Name@50) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('fooShort': Name@51) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('minus': Name@52) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('toByte': Name@59) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('toInt': Name@60) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('toLong': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('toShort': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('fooByte': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('fooInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('fooLong': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('fooShort': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('p1': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('p2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('p3': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('p4': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('p5': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('p6': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('fooByte': Name@48) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('fooInt': Name@49) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('fooLong': Name@50) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('fooShort': Name@51) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@65
+}
+
+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]
+    <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@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]
+    <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@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <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@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]
+    <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@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]
+    <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@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <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@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]
+    <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@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]
+    <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@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+    <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@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]
+    <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@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]
+    <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@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@59[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@59[empty]
+    <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]
+    <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@171 {
+    <name not found> = ArrayList@172[1] { ResolutionCandidate@173 }
+    <name not found> = ArrayList@174[1] { ResolutionCandidate@173 }
+    <name not found> = EmptyList@59[empty]
+    <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]
+    <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@183 {
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@185 }
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@185 }
+    <name not found> = EmptyList@59[empty]
+    <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]
+    <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@195 {
+    <name not found> = ArrayList@196[1] { ResolutionCandidate@197 }
+    <name not found> = ArrayList@198[1] { ResolutionCandidate@197 }
+    <name not found> = EmptyList@59[empty]
+    <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]
+    <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@207 {
+    <name not found> = ArrayList@208[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+    <name not found> = EmptyList@59[empty]
+    <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@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@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@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@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]
+}
+
+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@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@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@255 {
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@257 }
+    <name not found> = ArrayList@258[1] { ResolutionCandidate@257 }
+    <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 e28597e22c3..a24839fd896 100644
--- a/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
+++ b/compiler/testData/diagnostics/tests/evaluate/unaryMinusIndependentExpType.lazy.log
@@ -75,38 +75,211 @@ LazyJavaPackageFragment@27['<root>'] {
     classes('Int': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('Long': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('Short': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('minus': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('toByte': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('toInt': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('toLong': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('toShort': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('minus': Name@76) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('toByte': Name@77) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('toInt': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('toLong': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('toShort': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@41['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('lang': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-LazyJavaPackageFragment@43['lang'] {
-    classes('minus': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('toByte': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('toInt': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('toLong': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('toShort': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('minus': Name@76) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('toByte': Name@77) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('toInt': Name@78) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('toLong': Name@79) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('toShort': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
+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 }
+}
+
+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> = 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[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[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+    <name not found> = ArrayList@151[8] { ResolutionCandidate@148, ResolutionCandidate@149, ResolutionCandidate@150, ... }
+}
+
+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@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@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@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@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> = ArrayList@189[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+    <name not found> = ArrayList@193[8] { ResolutionCandidate@190, ResolutionCandidate@191, ResolutionCandidate@192, ... }
+}
+
+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@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@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[8] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
+    <name not found> = ArrayList@241[8] { ResolutionCandidate@238, ResolutionCandidate@239, ResolutionCandidate@240, ... }
+}
+
+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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
index 2f8d566d7c7..7762fa8854b 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionFunctions.lazy.log
@@ -6,46 +6,40 @@ DescriptorResolver@0 {
 LazyJavaClassDescriptor@3['Appendable'] {
     functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@6
-    properties('print': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
 }
 
-LazyJavaClassDescriptor@10['AutoCloseable'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@11
-    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
-    properties('print': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
+LazyJavaClassDescriptor@9['AutoCloseable'] {
+    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@10
+    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
+    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@14['Closeable'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    properties('print': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
+LazyJavaClassDescriptor@13['Closeable'] {
+    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
+    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
 }
 
-LazyJavaClassDescriptor@18['FilterOutputStream'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('print': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
+LazyJavaClassDescriptor@17['FilterOutputStream'] {
+    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@22['OutputStream'] {
-    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    properties('print': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
+LazyJavaClassDescriptor@21['OutputStream'] {
+    functions('print': Name@4) = EmptyList@5[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
 }
 
-LazyJavaClassDescriptor@26['PrintStream'] {
-    defaultType = JetTypeImpl@27['PrintStream']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@29
-    functions('print': Name@8) = ArrayList@30[9] { JavaMethodDescriptor@31['print'], JavaMethodDescriptor@32['print'], JavaMethodDescriptor@33['print'], ... } // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@29
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@29
-    nestedClasses('print': Name@8) = null // through LazyJavaClassMemberScope@29
-    properties('print': Name@8) = EmptyList@5[empty] // through LazyJavaClassMemberScope@29
+LazyJavaClassDescriptor@25['PrintStream'] {
+    defaultType = JetTypeImpl@26['PrintStream']
+    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
+    functions('print': Name@29) = ArrayList@30[9] { JavaMethodDescriptor@31['print'], JavaMethodDescriptor@32['print'], JavaMethodDescriptor@33['print'], ... } // through LazyJavaClassMemberScope@28
+    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@28
+    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@28
+    nestedClasses('print': Name@29) = null // through LazyJavaClassMemberScope@28
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@37['PrintStream']
 }
@@ -61,27 +55,27 @@ LazyJavaClassDescriptor@38['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@48['System']
 }
 
-LazyJavaClassTypeConstructor@9['Appendable'] {
+LazyJavaClassTypeConstructor@8['Appendable'] {
     parameters = ArrayList@49[empty]
     supertypes = ArrayList@50[1] { JetTypeImpl@51['Any'] }
 }
 
-LazyJavaClassTypeConstructor@13['AutoCloseable'] {
+LazyJavaClassTypeConstructor@12['AutoCloseable'] {
     parameters = ArrayList@52[empty]
     supertypes = ArrayList@53[1] { JetTypeImpl@51['Any'] }
 }
 
-LazyJavaClassTypeConstructor@17['Closeable'] {
+LazyJavaClassTypeConstructor@16['Closeable'] {
     parameters = ArrayList@54[empty]
     supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@21['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
     parameters = ArrayList@57[empty]
     supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@25['OutputStream'] {
+LazyJavaClassTypeConstructor@24['OutputStream'] {
     parameters = ArrayList@60[empty]
     supertypes = ArrayList@61[1] { LazyJavaClassifierType@62['Closeable'] }
 }
@@ -99,35 +93,35 @@ LazyJavaClassifierType@66['Appendable'] {
     arguments = ArrayList@69[empty]
     classifier = JavaClassImpl@70['Appendable']
     memberScope = LazyJavaClassMemberScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
 }
 
 LazyJavaClassifierType@56['AutoCloseable'] {
     arguments = ArrayList@71[empty]
     classifier = JavaClassImpl@72['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@11
-    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
-}
-
-LazyJavaClassifierType@62['Closeable'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaClassImpl@74['Closeable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
+    memberScope = LazyJavaClassMemberScope@10
+    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
 }
 
 LazyJavaClassifierType@67['Closeable'] {
+    arguments = ArrayList@73[empty]
+    classifier = JavaClassImpl@74['Closeable']
+    memberScope = LazyJavaClassMemberScope@14
+    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+}
+
+LazyJavaClassifierType@62['Closeable'] {
     arguments = ArrayList@75[empty]
     classifier = JavaClassImpl@76['Closeable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
+    memberScope = LazyJavaClassMemberScope@14
+    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
 }
 
 LazyJavaClassifierType@65['FilterOutputStream'] {
     arguments = ArrayList@77[empty]
     classifier = JavaClassImpl@78['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
 }
 
 LazyJavaClassifierType@79['Flushable'] {
@@ -172,14 +166,14 @@ LazyJavaClassifierType@95['Object'] {
 LazyJavaClassifierType@59['OutputStream'] {
     arguments = ArrayList@97[empty]
     classifier = JavaClassImpl@98['OutputStream']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
 }
 
 LazyJavaClassifierType@99['PrintStream'] {
     arguments = ArrayList@100[empty]
     classifier = JavaClassImpl@101['PrintStream']
-    memberScope = LazyJavaClassMemberScope@29
+    memberScope = LazyJavaClassMemberScope@28
     nullable = 'false': Boolean@84
     typeConstructor = LazyJavaClassTypeConstructor@37['PrintStream']
 }
@@ -270,11 +264,11 @@ LazyJavaPackageFragmentProvider@110 {
     packageFragments('outer.foo': FqName@176) = null
     packageFragments('outer.optval': FqName@177) = null
     topLevelClasses(JavaClassImpl@70['Appendable']) = LazyJavaClassDescriptor@3['Appendable']
-    topLevelClasses(JavaClassImpl@72['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
-    topLevelClasses(JavaClassImpl@76['Closeable']) = LazyJavaClassDescriptor@14['Closeable']
-    topLevelClasses(JavaClassImpl@78['FilterOutputStream']) = LazyJavaClassDescriptor@18['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@98['OutputStream']) = LazyJavaClassDescriptor@22['OutputStream']
-    topLevelClasses(JavaClassImpl@101['PrintStream']) = LazyJavaClassDescriptor@26['PrintStream']
+    topLevelClasses(JavaClassImpl@72['AutoCloseable']) = LazyJavaClassDescriptor@9['AutoCloseable']
+    topLevelClasses(JavaClassImpl@74['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']
     topLevelClasses(JavaClassImpl@178['System']) = LazyJavaClassDescriptor@38['System']
 }
 
@@ -288,27 +282,337 @@ LazyJavaPackageFragment@125['java'] {
 LazyJavaPackageFragment@129['lang'] {
     classes('Command': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@185
     classes('System': Name@186) = LazyJavaClassDescriptor@38['System'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('compareTo': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('equals': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('equals1': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('equals2': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('foo': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('invoke': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('minus': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('parse': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('plus': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('print': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('equals': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('equals1': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('equals2': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('foo': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('invoke': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('minus': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('parse': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('plus': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@185
     deserializedPackageScope = Empty@181 // through LazyPackageFragmentScopeForJavaPackage@185
     functions('Command': Name@184) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('compareTo': Name@187) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('equals': Name@188) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('equals1': Name@189) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('equals2': Name@190) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('foo': Name@191) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('invoke': Name@192) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('minus': Name@193) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('parse': Name@194) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('plus': Name@195) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('print': Name@8) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('equals': Name@187) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('equals1': Name@188) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('equals2': Name@189) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('foo': Name@190) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('invoke': Name@191) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('minus': Name@192) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('parse': Name@193) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('plus': Name@194) = EmptyList@5[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@185
+}
+
+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 }
+}
+
+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]
+    <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]
+}
+
+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> = EmptyList@5[empty]
+    <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]
+}
+
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+    <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]
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@5[empty]
+    <name not found> = EmptyList@5[empty]
+    <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@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@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@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[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[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[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]
+}
+
+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]
+    <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]
+}
+
+ResolutionTaskHolder@353 {
+    <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]
+}
+
+ResolutionTaskHolder@354 {
+    <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 0b70e617feb..e7bcf9e2ae8 100644
--- a/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/ExtensionsCalledOnSuper.lazy.log
@@ -17,33 +17,121 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('buzz': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('buzz1': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('bar': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('buzz': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('buzz1': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('buzz1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('buzz1': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('buzz': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('buzz1': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('buzz': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('buzz1': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('buzz1': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('buzz1': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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> = 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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log b/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
index e6bc6775640..402ff5575c2 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator.lazy.log
@@ -23,73 +23,67 @@ DescriptorResolver@8 {
 LazyJavaClassDescriptor@11['Appendable'] {
     functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@14
     memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    properties('println': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@17['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
 }
 
-LazyJavaClassDescriptor@18['AutoCloseable'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('println': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['AutoCloseable']
+LazyJavaClassDescriptor@17['AutoCloseable'] {
+    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@22['Closeable'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    properties('println': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['Closeable']
+LazyJavaClassDescriptor@21['Closeable'] {
+    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
 }
 
-LazyJavaClassDescriptor@26['Enumeration'] {
-    defaultType = JetTypeImpl@27['Enumeration<1>']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@29
+LazyJavaClassDescriptor@25['Enumeration'] {
+    defaultType = JetTypeImpl@26['Enumeration<1>']
+    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
     functionTypeForSamInterface = null
-    functions('hasMoreElements': Name@30) = ArrayList@31[1] { JavaMethodDescriptor@32['hasMoreElements'] } // through LazyJavaClassMemberScope@29
-    functions('nextElement': Name@33) = ArrayList@34[1] { JavaMethodDescriptor@35['nextElement'] } // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@29
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@29
-    nestedClasses('hasMoreElements': Name@30) = null // through LazyJavaClassMemberScope@29
-    nestedClasses('nextElement': Name@33) = null // through LazyJavaClassMemberScope@29
-    properties('hasMoreElements': Name@30) = EmptyList@13[empty] // through LazyJavaClassMemberScope@29
-    properties('nextElement': Name@33) = EmptyList@13[empty] // through LazyJavaClassMemberScope@29
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['Enumeration']
+    functions('hasMoreElements': Name@29) = ArrayList@30[1] { JavaMethodDescriptor@31['hasMoreElements'] } // through LazyJavaClassMemberScope@28
+    functions('nextElement': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['nextElement'] } // through LazyJavaClassMemberScope@28
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@28
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@28
+    nestedClasses('hasMoreElements': Name@29) = null // through LazyJavaClassMemberScope@28
+    nestedClasses('nextElement': Name@32) = null // through LazyJavaClassMemberScope@28
+    properties('hasMoreElements': Name@29) = EmptyList@13[empty] // through LazyJavaClassMemberScope@28
+    properties('nextElement': Name@32) = EmptyList@13[empty] // through LazyJavaClassMemberScope@28
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@38['Enumeration']
 }
 
-LazyJavaClassDescriptor@40['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@41['Exception']
+LazyJavaClassDescriptor@39['Exception'] {
+    typeConstructor = LazyJavaClassTypeConstructor@40['Exception']
 }
 
-LazyJavaClassDescriptor@42['FilterOutputStream'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@43
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@43
-    properties('println': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@43
-    typeConstructor = LazyJavaClassTypeConstructor@45['FilterOutputStream']
+LazyJavaClassDescriptor@41['FilterOutputStream'] {
+    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@42
+    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@42
+    typeConstructor = LazyJavaClassTypeConstructor@44['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@46['NoSuchElementException'] {
-    constructors = ArrayList@47[2] { JavaConstructorDescriptor@48['<init>'], JavaConstructorDescriptor@49['<init>'] } // through LazyJavaClassMemberScope@50
-    defaultType = JetTypeImpl@51['NoSuchElementException']
+LazyJavaClassDescriptor@45['NoSuchElementException'] {
+    constructors = ArrayList@46[2] { JavaConstructorDescriptor@47['<init>'], JavaConstructorDescriptor@48['<init>'] } // through LazyJavaClassMemberScope@49
+    defaultType = JetTypeImpl@50['NoSuchElementException']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@52['NoSuchElementException']
+    typeConstructor = LazyJavaClassTypeConstructor@51['NoSuchElementException']
 }
 
-LazyJavaClassDescriptor@53['OutputStream'] {
-    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@54
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
-    properties('println': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
+LazyJavaClassDescriptor@52['OutputStream'] {
+    functions('println': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@53
+    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
+    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
 }
 
-LazyJavaClassDescriptor@57['PrintStream'] {
-    defaultType = JetTypeImpl@58['PrintStream']
-    enumEntryIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@60
-    functions('println': Name@16) = ArrayList@61[10] { JavaMethodDescriptor@62['println'], JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], ... } // through LazyJavaClassMemberScope@60
-    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@60
-    nestedClassIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@60
-    nestedClasses('println': Name@16) = null // through LazyJavaClassMemberScope@60
-    properties('println': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@60
+LazyJavaClassDescriptor@56['PrintStream'] {
+    defaultType = JetTypeImpl@57['PrintStream']
+    enumEntryIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@59
+    functions('println': Name@60) = ArrayList@61[10] { JavaMethodDescriptor@62['println'], JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], ... } // through LazyJavaClassMemberScope@59
+    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@59
+    nestedClassIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@59
+    nestedClasses('println': Name@60) = null // through LazyJavaClassMemberScope@59
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@67['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@68['PrintStream']
 }
@@ -109,42 +103,42 @@ LazyJavaClassDescriptor@71['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@81['System']
 }
 
-LazyJavaClassTypeConstructor@17['Appendable'] {
+LazyJavaClassTypeConstructor@16['Appendable'] {
     parameters = ArrayList@82[empty]
     supertypes = ArrayList@83[1] { JetTypeImpl@84['Any'] }
 }
 
-LazyJavaClassTypeConstructor@21['AutoCloseable'] {
+LazyJavaClassTypeConstructor@20['AutoCloseable'] {
     parameters = ArrayList@85[empty]
     supertypes = ArrayList@86[1] { JetTypeImpl@84['Any'] }
 }
 
-LazyJavaClassTypeConstructor@25['Closeable'] {
+LazyJavaClassTypeConstructor@24['Closeable'] {
     parameters = ArrayList@87[empty]
     supertypes = ArrayList@88[1] { LazyJavaClassifierType@89['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@39['Enumeration'] {
+LazyJavaClassTypeConstructor@38['Enumeration'] {
     parameters = ArrayList@90[1] { LazyJavaTypeParameterDescriptor@91['E'] }
     supertypes = ArrayList@92[1] { JetTypeImpl@84['Any'] }
 }
 
-LazyJavaClassTypeConstructor@41['Exception'] {
+LazyJavaClassTypeConstructor@40['Exception'] {
     parameters = ArrayList@93[empty]
     supertypes = ArrayList@94[1] { LazyJavaClassifierType@95['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@45['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@44['FilterOutputStream'] {
     parameters = ArrayList@96[empty]
     supertypes = ArrayList@97[1] { LazyJavaClassifierType@98['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@52['NoSuchElementException'] {
+LazyJavaClassTypeConstructor@51['NoSuchElementException'] {
     parameters = ArrayList@99[empty]
     supertypes = ArrayList@100[1] { LazyJavaClassifierType@101['RuntimeException'] }
 }
 
-LazyJavaClassTypeConstructor@56['OutputStream'] {
+LazyJavaClassTypeConstructor@55['OutputStream'] {
     parameters = ArrayList@102[empty]
     supertypes = ArrayList@103[1] { LazyJavaClassifierType@104['Closeable'] }
 }
@@ -167,28 +161,28 @@ LazyJavaClassifierType@108['Appendable'] {
     arguments = ArrayList@114[empty]
     classifier = JavaClassImpl@115['Appendable']
     memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@17['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Appendable']
 }
 
 LazyJavaClassifierType@89['AutoCloseable'] {
     arguments = ArrayList@116[empty]
     classifier = JavaClassImpl@117['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['AutoCloseable']
 }
 
 LazyJavaClassifierType@109['Closeable'] {
     arguments = ArrayList@118[empty]
     classifier = JavaClassImpl@119['Closeable']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['Closeable']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
 }
 
 LazyJavaClassifierType@104['Closeable'] {
     arguments = ArrayList@120[empty]
     classifier = JavaClassImpl@121['Closeable']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['Closeable']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Closeable']
 }
 
 LazyJavaClassifierType@122['E'] {
@@ -208,14 +202,14 @@ LazyJavaClassifierType@127['E'] {
 LazyJavaClassifierType@112['Exception'] {
     arguments = ArrayList@130[empty]
     classifier = JavaClassImpl@131['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@41['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@40['Exception']
 }
 
 LazyJavaClassifierType@107['FilterOutputStream'] {
     arguments = ArrayList@132[empty]
     classifier = JavaClassImpl@133['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@43
-    typeConstructor = LazyJavaClassTypeConstructor@45['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@42
+    typeConstructor = LazyJavaClassTypeConstructor@44['FilterOutputStream']
 }
 
 LazyJavaClassifierType@134['Flushable'] {
@@ -265,14 +259,14 @@ LazyJavaClassifierType@150['Object'] {
 LazyJavaClassifierType@98['OutputStream'] {
     arguments = ArrayList@152[empty]
     classifier = JavaClassImpl@153['OutputStream']
-    memberScope = LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
+    memberScope = LazyJavaClassMemberScope@53
+    typeConstructor = LazyJavaClassTypeConstructor@55['OutputStream']
 }
 
 LazyJavaClassifierType@154['PrintStream'] {
     arguments = ArrayList@155[empty]
     classifier = JavaClassImpl@156['PrintStream']
-    memberScope = LazyJavaClassMemberScope@60
+    memberScope = LazyJavaClassMemberScope@59
     nullable = 'false': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@68['PrintStream']
 }
@@ -362,14 +356,14 @@ LazyJavaPackageFragmentProvider@175 {
     packageFragments('kotlin.io': FqName@215) = null
     packageFragments('kotlin.jvm': FqName@216) = null
     topLevelClasses(JavaClassImpl@115['Appendable']) = LazyJavaClassDescriptor@11['Appendable']
-    topLevelClasses(JavaClassImpl@117['AutoCloseable']) = LazyJavaClassDescriptor@18['AutoCloseable']
-    topLevelClasses(JavaClassImpl@119['Closeable']) = LazyJavaClassDescriptor@22['Closeable']
-    topLevelClasses(JavaClassImpl@217['Enumeration']) = LazyJavaClassDescriptor@26['Enumeration']
-    topLevelClasses(JavaClassImpl@131['Exception']) = LazyJavaClassDescriptor@40['Exception']
-    topLevelClasses(JavaClassImpl@133['FilterOutputStream']) = LazyJavaClassDescriptor@42['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@218['NoSuchElementException']) = LazyJavaClassDescriptor@46['NoSuchElementException']
-    topLevelClasses(JavaClassImpl@153['OutputStream']) = LazyJavaClassDescriptor@53['OutputStream']
-    topLevelClasses(JavaClassImpl@156['PrintStream']) = LazyJavaClassDescriptor@57['PrintStream']
+    topLevelClasses(JavaClassImpl@117['AutoCloseable']) = LazyJavaClassDescriptor@17['AutoCloseable']
+    topLevelClasses(JavaClassImpl@119['Closeable']) = LazyJavaClassDescriptor@21['Closeable']
+    topLevelClasses(JavaClassImpl@217['Enumeration']) = LazyJavaClassDescriptor@25['Enumeration']
+    topLevelClasses(JavaClassImpl@131['Exception']) = LazyJavaClassDescriptor@39['Exception']
+    topLevelClasses(JavaClassImpl@133['FilterOutputStream']) = LazyJavaClassDescriptor@41['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@218['NoSuchElementException']) = LazyJavaClassDescriptor@45['NoSuchElementException']
+    topLevelClasses(JavaClassImpl@153['OutputStream']) = LazyJavaClassDescriptor@52['OutputStream']
+    topLevelClasses(JavaClassImpl@156['PrintStream']) = LazyJavaClassDescriptor@56['PrintStream']
     topLevelClasses(JavaClassImpl@160['RuntimeException']) = LazyJavaClassDescriptor@69['RuntimeException']
     topLevelClasses(JavaClassImpl@219['System']) = LazyJavaClassDescriptor@71['System']
 }
@@ -384,75 +378,293 @@ LazyJavaPackageFragment@177['<root>'] {
     classes('String': Name@227) = null // through LazyPackageFragmentScopeForJavaPackage@221
     classes('System': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@221
     classes('equals': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('hasMoreElements': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@221
+    classes('hasMoreElements': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@221
     classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@221
     classes('iterator': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@221
     classes('java': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('next': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('nextElement': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    classes('println': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@221
-    deserializedPackageScope = Empty@234 // through LazyPackageFragmentScopeForJavaPackage@221
+    classes('nextElement': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@221
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@221
     functions('equals': Name@229) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('hasMoreElements': Name@30) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('hasNext': Name@235) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
+    functions('hasMoreElements': Name@29) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
     functions('iterator': Name@231) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('java': Name@236) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('next': Name@233) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('nextElement': Name@33) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    functions('println': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
-    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@221
+    functions('java': Name@234) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
+    functions('nextElement': Name@32) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@221
+    memberIndex = computeMemberIndex$1@235 // through LazyPackageFragmentScopeForJavaPackage@221
 }
 
 LazyJavaPackageFragment@188['java'] {
-    classes('lang': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    classes('util': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@239
-    deserializedPackageScope = Empty@234 // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('lang': Name@241) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('util': Name@242) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    memberIndex = computeMemberIndex$1@243 // through LazyPackageFragmentScopeForJavaPackage@239
+    classes('lang': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    classes('util': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@237
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('lang': Name@239) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    functions('util': Name@240) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@237
+    memberIndex = computeMemberIndex$1@241 // through LazyPackageFragmentScopeForJavaPackage@237
 }
 
 LazyJavaPackageFragment@192['lang'] {
-    classes('System': Name@228) = LazyJavaClassDescriptor@71['System'] // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('equals': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('hasMoreElements': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('iterator': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('java': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('next': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('nextElement': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    classes('println': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@244
-    deserializedPackageScope = Empty@234 // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('equals': Name@229) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('hasMoreElements': Name@30) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('hasNext': Name@235) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('iterator': Name@231) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('next': Name@233) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('nextElement': Name@33) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('println': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    memberIndex = computeMemberIndex$1@246 // through LazyPackageFragmentScopeForJavaPackage@244
+    classes('System': Name@228) = LazyJavaClassDescriptor@71['System'] // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('equals': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('hasMoreElements': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('hasNext': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('iterator': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('java': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('nextElement': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('equals': Name@229) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('hasMoreElements': Name@29) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('iterator': Name@231) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('nextElement': Name@32) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    memberIndex = computeMemberIndex$1@244 // through LazyPackageFragmentScopeForJavaPackage@242
 }
 
 LazyJavaPackageFragment@203['util'] {
-    classes('Enumeration': Name@247) = LazyJavaClassDescriptor@26['Enumeration'] // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('NoSuchElementException': Name@249) = LazyJavaClassDescriptor@46['NoSuchElementException'] // through LazyPackageFragmentScopeForJavaPackage@248
-    deserializedPackageScope = Empty@234 // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('Enumeration': Name@250) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('NoSuchElementException': Name@249) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    memberIndex = computeMemberIndex$1@251 // through LazyPackageFragmentScopeForJavaPackage@248
+    classes('Enumeration': Name@245) = LazyJavaClassDescriptor@25['Enumeration'] // through LazyPackageFragmentScopeForJavaPackage@246
+    classes('NoSuchElementException': Name@247) = LazyJavaClassDescriptor@45['NoSuchElementException'] // through LazyPackageFragmentScopeForJavaPackage@246
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@246
+    functions('Enumeration': Name@248) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@246
+    functions('NoSuchElementException': Name@247) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@246
+    memberIndex = computeMemberIndex$1@249 // through LazyPackageFragmentScopeForJavaPackage@246
 }
 
 LazyJavaTypeParameterDescriptor@91['E'] {
-    defaultType = JetTypeImpl@252['E']
+    defaultType = JetTypeImpl@250['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
-    upperBounds = LinkedHashSet@253[1] { NullableType@254 }
-    upperBoundsAsType = NullableType@254
+    upperBounds = LinkedHashSet@251[1] { NullableType@252 }
+    upperBoundsAsType = NullableType@252
+}
+
+LazyJavaTypeParameterResolver@253 {
+    resolve(JavaTypeParameterImpl@254['E']) = LazyJavaTypeParameterDescriptor@91['E']
 }
 
 LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@91['E']
-}
-
-LazyJavaTypeParameterResolver@257 {
     resolve(JavaTypeParameterImpl@124['E']) = null
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@277 {
+    <name not found> = ArrayList@278[1] { ResolutionCandidate@279 }
+    <name not found> = ArrayList@280[1] { ResolutionCandidate@279 }
+    <name not found> = EmptyList@13[empty]
+    <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@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@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[2] { ResolutionCandidate@315, ResolutionCandidate@316 }
+    <name not found> = ArrayList@317[2] { ResolutionCandidate@315, ResolutionCandidate@316 }
+    <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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@324 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@325 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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 f414b1dedc3..c7bdaa4dd12 100644
--- a/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/GenericIterator2.lazy.log
@@ -83,64 +83,135 @@ LazyJavaPackageFragment@39['<root>'] {
     classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('Iterator': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('hasMoreElements': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('iterator': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('java': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('java': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('nextElement': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@64
     functions('hasMoreElements': Name@10) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('hasNext': Name@68) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     functions('iterator': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('java': Name@72) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('next': Name@70) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('java': Name@70) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     functions('nextElement': Name@15) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('util': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('lang': Name@77) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('util': Name@78) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('lang': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('util': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('lang': Name@75) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('util': Name@76) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    classes('hasMoreElements': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('hasNext': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('iterator': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('java': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('next': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('nextElement': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('hasMoreElements': Name@10) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('hasNext': Name@68) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('iterator': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('next': Name@70) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('nextElement': Name@15) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('hasMoreElements': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('iterator': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('java': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('nextElement': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('hasMoreElements': Name@10) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('iterator': Name@13) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('nextElement': Name@15) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@53['util'] {
-    classes('Enumeration': Name@83) = LazyJavaClassDescriptor@6['Enumeration'] // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('Enumeration': Name@85) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('Enumeration': Name@81) = LazyJavaClassDescriptor@6['Enumeration'] // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@69 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('Enumeration': Name@83) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
 LazyJavaTypeParameterDescriptor@23['E'] {
-    defaultType = JetTypeImpl@87['E']
+    defaultType = JetTypeImpl@85['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
-    upperBounds = LinkedHashSet@88[1] { NullableType@89 }
-    upperBoundsAsType = NullableType@89
+    upperBounds = LinkedHashSet@86[1] { NullableType@87 }
+    upperBoundsAsType = NullableType@87
+}
+
+LazyJavaTypeParameterResolver@88 {
+    resolve(JavaTypeParameterImpl@89['E']) = LazyJavaTypeParameterDescriptor@23['E']
 }
 
 LazyJavaTypeParameterResolver@90 {
-    resolve(JavaTypeParameterImpl@91['E']) = LazyJavaTypeParameterDescriptor@23['E']
-}
-
-LazyJavaTypeParameterResolver@92 {
     resolve(JavaTypeParameterImpl@28['E']) = null
 }
+
+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]
+    <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@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]
+    <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@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]
+    <name not found> = EmptyList@14[empty]
+    <name not found> = EmptyList@14[empty]
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log b/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
index 20b453b8ad6..57ee2e21131 100644
--- a/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/classObject.lazy.log
@@ -56,3 +56,219 @@ LazyJavaPackageFragment@10['lang'] {
     functions('f5': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <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@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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+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@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@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]
+}
+
+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 }
+    <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 4eab892bd43..b6764eaf557 100644
--- a/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/extensionMemberInClassObject.lazy.log
@@ -55,3 +55,169 @@ LazyJavaPackageFragment@13['lang'] {
     functions('with': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
 }
+
+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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
index 93177d58b57..6828a31f0a4 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt1875.lazy.log
@@ -41,3 +41,248 @@ LazyJavaPackageFragment@11['lang'] {
     functions('invoke': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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> = 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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <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]
+    <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 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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@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[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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
index 199222ca773..898408555fc 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt2317.lazy.log
@@ -44,3 +44,45 @@ LazyJavaPackageFragment@13['lang'] {
     functions('baz': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+    <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]
+    <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 }
+}
+
+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/extensions/kt3470.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
index e120554877c..0de2cdfb282 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt3470.lazy.log
@@ -37,3 +37,32 @@ LazyJavaPackageFragment@10['lang'] {
     functions('toString': Name@16) = 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> = 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]
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
index a318cdc2889..06192613bfc 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt3563.lazy.log
@@ -7,7 +7,6 @@ LazyJavaClassDescriptor@0['File'] {
     nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
     nestedClasses('getName': Name@4) = null // through LazyJavaClassMemberScope@3
     nestedClasses('name': Name@9) = null // through LazyJavaClassMemberScope@3
-    properties('getName': Name@4) = EmptyList@10[empty] // through LazyJavaClassMemberScope@3
     properties('name': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@3
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@12['File']
@@ -16,7 +15,6 @@ LazyJavaClassDescriptor@0['File'] {
 LazyJavaClassDescriptor@13['Serializable'] {
     functions('getName': Name@14) = EmptyList@10[empty] // through LazyJavaClassMemberScope@15
     memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    properties('getName': Name@4) = EmptyList@10[empty] // through LazyJavaClassMemberScope@15
     properties('name': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@15
     typeConstructor = LazyJavaClassTypeConstructor@17['Serializable']
 }
@@ -132,3 +130,47 @@ LazyJavaPackageFragment@67['lang'] {
     functions('getName': Name@4) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
+
+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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@10[empty]
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log b/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
index 8b88d0054e7..a2f381291c6 100644
--- a/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/kt819ExtensionProperties.lazy.log
@@ -113,14 +113,14 @@ LazyJavaClassifierType@58['AutoCloseable'] {
     typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
-LazyJavaClassifierType@61['Closeable'] {
+LazyJavaClassifierType@67['Closeable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['Closeable']
     memberScope = LazyJavaClassMemberScope@29
     typeConstructor = LazyJavaClassTypeConstructor@31['Closeable']
 }
 
-LazyJavaClassifierType@67['Closeable'] {
+LazyJavaClassifierType@61['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
     memberScope = LazyJavaClassMemberScope@29
@@ -266,7 +266,7 @@ LazyJavaPackageFragmentProvider@111 {
     topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
     topLevelClasses(JavaClassImpl@157['BufferedInputStream']) = LazyJavaClassDescriptor@14['BufferedInputStream']
     topLevelClasses(JavaClassImpl@158['BufferedReader']) = LazyJavaClassDescriptor@21['BufferedReader']
-    topLevelClasses(JavaClassImpl@71['Closeable']) = LazyJavaClassDescriptor@28['Closeable']
+    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@28['Closeable']
     topLevelClasses(JavaClassImpl@159['InputStream']) = LazyJavaClassDescriptor@32['InputStream']
     topLevelClasses(JavaClassImpl@98['Readable']) = LazyJavaClassDescriptor@38['Readable']
     topLevelClasses(JavaClassImpl@160['Reader']) = LazyJavaClassDescriptor@42['Reader']
@@ -279,49 +279,136 @@ LazyJavaPackageFragment@113['<root>'] {
     classes('Int': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@162
     classes('Reader': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@162
     classes('String': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('foo': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('inline': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    classes('java': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@171 // through LazyPackageFragmentScopeForJavaPackage@162
+    classes('inline': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@162
+    classes('java': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@162
+    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@162
     functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
     functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('foo': Name@168) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('java': Name@172) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@173 // through LazyPackageFragmentScopeForJavaPackage@162
+    functions('java': Name@171) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@162
+    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@162
 }
 
 LazyJavaPackageFragment@127['io'] {
-    classes('BufferedInputStream': Name@161) = LazyJavaClassDescriptor@14['BufferedInputStream'] // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('BufferedReader': Name@163) = LazyJavaClassDescriptor@21['BufferedReader'] // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('InputStream': Name@164) = LazyJavaClassDescriptor@32['InputStream'] // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Int': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('Reader': Name@166) = LazyJavaClassDescriptor@42['Reader'] // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('String': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('foo': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    classes('inline': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    deserializedPackageScope = Empty@171 // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('foo': Name@168) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@174
+    classes('BufferedInputStream': Name@161) = LazyJavaClassDescriptor@14['BufferedInputStream'] // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('BufferedReader': Name@163) = LazyJavaClassDescriptor@21['BufferedReader'] // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('InputStream': Name@164) = LazyJavaClassDescriptor@32['InputStream'] // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('Int': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('Reader': Name@166) = LazyJavaClassDescriptor@42['Reader'] // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('String': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('inline': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@173
+    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@173
+    memberIndex = computeMemberIndex$1@174 // through LazyPackageFragmentScopeForJavaPackage@173
 }
 
 LazyJavaPackageFragment@125['java'] {
-    classes('io': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    classes('lang': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    deserializedPackageScope = Empty@171 // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('io': Name@179) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('lang': Name@180) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@177
+    classes('io': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    classes('lang': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@176
+    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('io': Name@178) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    functions('lang': Name@179) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@176
+    memberIndex = computeMemberIndex$1@180 // through LazyPackageFragmentScopeForJavaPackage@176
 }
 
 LazyJavaPackageFragment@137['lang'] {
-    classes('BufferedInputStream': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('BufferedReader': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    classes('foo': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@182
-    deserializedPackageScope = Empty@171 // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    functions('foo': Name@168) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@182
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('BufferedInputStream': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    classes('BufferedReader': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@181
+    deserializedPackageScope = Empty@170 // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('BufferedInputStream': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    functions('BufferedReader': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@181
+    memberIndex = computeMemberIndex$1@182 // through LazyPackageFragmentScopeForJavaPackage@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> = ArrayList@208[1] { ResolutionCandidate@209 }
+    <name not found> = ArrayList@210[1] { ResolutionCandidate@209 }
+}
+
+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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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[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 }
+    <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 7a48ca80ce1..2c978dc58d7 100644
--- a/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/noClassObjectsInJava.lazy.log
@@ -83,3 +83,114 @@ LazyJavaPackageFragment@38['java'] {
 LazyJavaPackageFragment@40['lang'] {
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@57
 }
+
+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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+ResolutionTaskHolder@64 {
+    <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 9df60986c82..accdb062e17 100644
--- a/compiler/testData/diagnostics/tests/extensions/object.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/object.lazy.log
@@ -28,25 +28,68 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('Any': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('Int': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('plus': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 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('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': 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@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]
+}
+
+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]
+    <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]
+    <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]
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
index edb593cb007..3b432d9f4bb 100644
--- a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver.lazy.log
@@ -61,3 +61,414 @@ LazyJavaPackageFragment@23['lang'] {
     functions('sure': Name@54) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
 }
+
+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]
+    <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@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]
+    <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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@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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log b/compiler/testData/diagnostics/tests/extensions/throwOutCandidatesByReceiver2.lazy.log
index 32e7175ec82..7eaab2d6af3 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@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -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
 }
@@ -146,3 +146,76 @@ LazyJavaPackageFragment@66['lang'] {
     functions('rangeTo': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
+
+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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <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@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[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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/functionLiterals/DanglingFunctionLiteral.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
index 03796aafc5b..5b8c06a7be6 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/DanglingFunctionLiteral.lazy.log
@@ -88,3 +88,119 @@ LazyJavaPackageFragment@37['lang'] {
     functions('println': Name@50) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
+
+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]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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, ... }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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 55864dc72a6..4d159ec879c 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParameterTypeMismatchVariance.lazy.log
@@ -37,3 +37,64 @@ LazyJavaPackageFragment@15['lang'] {
     functions('foo': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+}
+
+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]
+}
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
index 05d93c29e1a..e78550d0a69 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/ExpectedParametersTypesMismatch.lazy.log
@@ -39,3 +39,252 @@ LazyJavaPackageFragment@15['lang'] {
     functions('foo2': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[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]
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <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]
+    <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@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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
index e8a59b6b364..1f0f217d7fd 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/LabeledFunctionLiterals.lazy.log
@@ -34,10 +34,56 @@ LazyJavaPackageFragment@13['java'] {
 LazyJavaPackageFragment@15['lang'] {
     classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
     functions('f': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     functions('foo': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('invoke': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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 }
+}
+
+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 }
+    <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/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
index 5d2d5b796bd..165db5ebeaf 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/NoDanglingFunctionLiteralForNestedCalls.lazy.log
@@ -29,3 +29,58 @@ LazyJavaPackageFragment@11['lang'] {
     functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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[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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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@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 c2f10a1e04f..ccc7e8d390e 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/functionLIteralInBlockInIf.lazy.log
@@ -53,3 +53,37 @@ LazyJavaPackageFragment@12['lang'] {
     functions('checkType': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
 }
+
+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@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 }
+}
+
+ResolutionTaskHolder@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+}
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
index fa92f779c20..d1679e8c510 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/functionLiteralWithoutArgumentList.lazy.log
@@ -58,3 +58,41 @@ LazyJavaPackageFragment@13['lang'] {
     functions('id': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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]
+    <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@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/functionLiterals/kt2906.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
index 0b2296d2c8c..33a79025b91 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt2906.lazy.log
@@ -40,16 +40,107 @@ LazyJavaPackageFragment@17['lang'] {
     classes('f': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('foo1': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('foo2': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('println': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('run': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('println': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('run': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
     deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
     functions('bar': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('f': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('foo1': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('foo2': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('println': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('run': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('println': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('run': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+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@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> = 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/functionLiterals/kt4529.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
index 88f3d3c3f5e..7da27235a12 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/kt4529.lazy.log
@@ -31,33 +31,134 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('G': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('use': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('G': Name@29) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('foo': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('use': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('use': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('G': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('use': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('G': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('plus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('use': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('G': Name@29) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('foo': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('plus': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('use': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('G': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('use': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('G': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('use': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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]
+    <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 }
+    <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@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]
+    <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@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 }
+}
+
+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 }
+}
+
+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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
index 327dd57617f..7c95505b9dc 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabels.lazy.log
@@ -35,3 +35,48 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+    <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]
+    <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]
+    <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 8375d4f759f..8b9c13a45ca 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/AutoLabelsNonLocal.lazy.log
@@ -39,3 +39,21 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <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 bb2238a4c49..328f7fd5708 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/ForbiddenNonLocalReturnNoType.lazy.log
@@ -12,29 +12,91 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('f': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('invoke': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('run': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('f': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('invoke': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('run': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('run': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('f': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('run': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('f': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('run': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('f': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('run': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('f': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('run': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('f': Name@13) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('run': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <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@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
index 536d243912e..19b87045dbe 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalAndNonLocalReturnInLambda.lazy.log
@@ -15,34 +15,62 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
index 0ec0388e58b..8084054d91b 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelNoParens.lazy.log
@@ -16,29 +16,51 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('run': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('f': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('run': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
index 0ec0388e58b..2760a8a029f 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnExplicitLabelParens.lazy.log
@@ -16,29 +16,65 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('run': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('f': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('run': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <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@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@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
index 77078b2a27d..2505ae02a1f 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnHasTypeNothing.lazy.log
@@ -20,29 +20,46 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Nothing': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('run1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('run1': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('run1': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('run1': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('run1': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('run1': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('run1': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('run1': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
index 496ffd68178..12c54e33238 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedFunction.lazy.log
@@ -19,34 +19,62 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('run': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('compareTo': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('run': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('run': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('compareTo': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('run': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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@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@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/LocalReturnInNestedLambda.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
index 0ec0388e58b..90d3ed00a10 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnInNestedLambda.lazy.log
@@ -16,29 +16,60 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('run': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('f': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('run': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
index 536d243912e..19b87045dbe 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnNoCoercionToUnit.lazy.log
@@ -15,34 +15,62 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
index bb705e4184d..9219ea160de 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnUnit.lazy.log
@@ -19,34 +19,74 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('run': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('compareTo': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('run': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('compareTo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('run': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('compareTo': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('run': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('run': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('run': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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@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@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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
index 536d243912e..94c5e4aa5f8 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/LocalReturnsWithExplicitReturnType.lazy.log
@@ -15,34 +15,75 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <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]
+    <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]
+}
+
+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 41251798c17..fca81b3d31f 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/return/MixedReturnsFromLambda.lazy.log
@@ -20,34 +20,77 @@ LazyJavaPackageFragmentProvider@0 {
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('f': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('run': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('run': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('f': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('run': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@22) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('f': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('invoke': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('run': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('run': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('run': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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@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@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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
index ef787c6138e..7e677640c08 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/returnNull.lazy.log
@@ -33,7 +33,7 @@ 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
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -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
 }
@@ -150,3 +150,48 @@ LazyJavaPackageFragment@59['lang'] {
     functions('getOrElse': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
 }
+
+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@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, ... }
+    <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/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
index db206e86cda..3170d355f46 100644
--- a/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/functionLiterals/unusedLiteralInsideUnitLiteral.lazy.log
@@ -24,29 +24,46 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Unit': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('run': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('f': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('run': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('run': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@8['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@10['lang'] {
-    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('run': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('f': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('run': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('f': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('run': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('f': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('run': 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@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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
 }
diff --git a/compiler/testData/diagnostics/tests/generics/Projections.lazy.log b/compiler/testData/diagnostics/tests/generics/Projections.lazy.log
index 088cee76a2e..0037e80c7fe 100644
--- a/compiler/testData/diagnostics/tests/generics/Projections.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/Projections.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@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
 }
@@ -182,3 +182,492 @@ LazyJavaPackageFragment@64['lang'] {
     functions('outf': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@101
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
 }
+
+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]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <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@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]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <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@111 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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@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@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> = 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[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[2] { ResolutionCandidate@189, ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+    <name not found> = ArrayList@196[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+}
+
+ResolutionTaskHolder@197 {
+    <name not found> = ArrayList@198[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
+    <name not found> = ArrayList@201[2] { ResolutionCandidate@199, ResolutionCandidate@200 }
+}
+
+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@212 {
+    <name not found> = ArrayList@213[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
+    <name not found> = ArrayList@216[2] { ResolutionCandidate@214, ResolutionCandidate@215 }
+}
+
+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]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <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]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <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@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]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <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@250 {
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <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@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 fc11eab3e8b..14e88853386 100644
--- a/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/PseudoRawTypes.lazy.log
@@ -5,68 +5,66 @@ LazyJavaClassDescriptor@0['Usage'] {
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
     nestedClasses('foo': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('foo': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Usage']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['Usage']
 }
 
-LazyJavaClassTypeConstructor@11['Usage'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { JetTypeImpl@14['Any'] }
+LazyJavaClassTypeConstructor@10['Usage'] {
+    parameters = ArrayList@11[empty]
+    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
 }
 
-LazyJavaClassifierType@15['Collection'] {
-    arguments = ArrayList@16[1] { LazyStarProjection@17 }
-    classifier = JavaClassImpl@18['Collection']
-    nullable = 'false': Boolean@19
-    typeConstructor = DeserializedClassTypeConstructor@20
+LazyJavaClassifierType@14['Collection'] {
+    arguments = ArrayList@15[1] { LazyStarProjection@16 }
+    classifier = JavaClassImpl@17['Collection']
+    nullable = 'false': Boolean@18
+    typeConstructor = DeserializedClassTypeConstructor@19
 }
 
-LazyJavaClassifierType@21['Collection'] {
-    arguments = ArrayList@22[1] { LazyStarProjection@23 }
-    classifier = JavaClassImpl@18['Collection']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@20['Collection'] {
+    arguments = ArrayList@21[1] { LazyStarProjection@22 }
+    classifier = JavaClassImpl@17['Collection']
+    nullable = 'true': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaClassifierType@26['Object'] {
-    classifier = JavaClassImpl@27['Object']
-    typeConstructor = DeserializedClassTypeConstructor@28
+LazyJavaClassifierType@25['Object'] {
+    classifier = JavaClassImpl@26['Object']
+    typeConstructor = DeserializedClassTypeConstructor@27
 }
 
-LazyJavaPackageFragmentProvider@29 {
-    packageFragments('<root>': FqName@30) = LazyJavaPackageFragment@31['<root>']
-    packageFragments('Usage': FqName@32) = null
-    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    packageFragments('java.lang.Usage': FqName@37) = null
-    packageFragments('kotlin': FqName@38) = null
-    packageFragments('kotlin.Usage': FqName@39) = null
-    packageFragments('kotlin.io': FqName@40) = null
-    packageFragments('kotlin.jvm': FqName@41) = null
-    packageFragments('test': FqName@42) = LazyJavaPackageFragment@43['test']
-    packageFragments('test.Usage': FqName@44) = null
-    topLevelClasses(JavaClassImpl@45['Usage']) = LazyJavaClassDescriptor@0['Usage']
+LazyJavaPackageFragmentProvider@28 {
+    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
+    packageFragments('Usage': FqName@31) = null
+    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
+    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
+    packageFragments('java.lang.Usage': FqName@36) = null
+    packageFragments('kotlin': FqName@37) = null
+    packageFragments('kotlin.Usage': FqName@38) = null
+    packageFragments('kotlin.io': FqName@39) = null
+    packageFragments('kotlin.jvm': FqName@40) = null
+    packageFragments('test': FqName@41) = LazyJavaPackageFragment@42['test']
+    packageFragments('test.Usage': FqName@43) = null
+    topLevelClasses(JavaClassImpl@44['Usage']) = LazyJavaClassDescriptor@0['Usage']
 }
 
-LazyJavaPackageFragment@34['java'] {
-    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@49) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@47
+LazyJavaPackageFragment@33['java'] {
+    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('lang': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@46
 }
 
-LazyJavaPackageFragment@36['lang'] {
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('foo': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+LazyJavaPackageFragment@42['test'] {
+    classes('Usage': Name@51) = LazyJavaClassDescriptor@0['Usage'] // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@43['test'] {
-    classes('Usage': Name@53) = LazyJavaClassDescriptor@0['Usage'] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
+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/generics/RawTypeInIsExpression.lazy.log b/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
index bead0273122..b407915123a 100644
--- a/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/RawTypeInIsExpression.lazy.log
@@ -30,3 +30,48 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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@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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log b/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
index 0746eb58a9f..a2e1f07d0a5 100644
--- a/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/RawTypeInIsPattern.lazy.log
@@ -32,3 +32,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <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 1d41adc8315..11ab49cd587 100644
--- a/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/RecursiveUpperBoundCheck.lazy.log
@@ -25,3 +25,13 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/generics/recursive.lazy.log b/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
index d50b749b5bc..beda9c23991 100644
--- a/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/recursive.lazy.log
@@ -29,3 +29,43 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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@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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
index 32d8090b260..2570ca3877c 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/Conventions.lazy.log
@@ -65,3 +65,79 @@ LazyJavaPackageFragment@17['lang'] {
     functions('tp': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
 }
+
+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]
+    <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@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@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 }
+}
+
+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]
+    <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 }
+    <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 d236ef00bee..8a69708d6f3 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InConstructor.lazy.log
@@ -40,3 +40,53 @@ LazyJavaPackageFragment@10['lang'] {
     functions('C': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <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]
+    <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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@56 }
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InFunction.lazy.log
index 506a595f85c..c5aa940fb7b 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@36['String']
+    classifier = JavaClassImpl@31['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@33
 }
 
 LazyJavaClassifierType@40['String'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@31['String']
+    classifier = JavaClassImpl@36['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@33
 }
@@ -158,3 +158,67 @@ LazyJavaPackageFragment@65['lang'] {
     functions('f': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
+
+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@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]
+}
+
+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@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@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]
+}
+
+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[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]
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
index c226ad3ea1e..508f348da5d 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InProperty.lazy.log
@@ -147,3 +147,38 @@ LazyJavaPackageFragment@60['lang'] {
     functions('UnsupportedOperationException': Name@74) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@77[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[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <name not found> = ArrayList@106[4] { ResolutionCandidate@103, ResolutionCandidate@104, ResolutionCandidate@105, ... }
+    <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 31c81196e64..10ddc73dc60 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/InlineableReified.lazy.log
@@ -56,3 +56,41 @@ LazyJavaPackageFragment@17['lang'] {
     functions('foo': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
 }
+
+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]
+    <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@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[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
index 12609b1aee0..3f9aeee6f3d 100644
--- a/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/tpAsReified/LocalFun.lazy.log
@@ -40,3 +40,13 @@ LazyJavaPackageFragment@12['lang'] {
     functions('bar': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log b/compiler/testData/diagnostics/tests/generics/tpAsReified/ReifiedClass.lazy.log
index c842c8844c0..64efec86200 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@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -138,3 +138,24 @@ LazyJavaPackageFragment@59['lang'] {
     functions('UnsupportedOperationException': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
index 7783fb5667b..4ba49ac0362 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterNotProjectedOutAssign.lazy.log
@@ -52,3 +52,47 @@ LazyJavaPackageFragment@12['lang'] {
     functions('checkType': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
 }
+
+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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
index 080ef586894..8a217ff0bbf 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutAssign.lazy.log
@@ -57,3 +57,47 @@ LazyJavaPackageFragment@13['lang'] {
     functions('checkType': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
 }
+
+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@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@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/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
index 20888006afa..5a178f89507 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutNoPlusAssign.lazy.log
@@ -18,26 +18,80 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plusAssign': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plusAssign': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('plusAssign': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('plusAssign': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plusAssign': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plusAssign': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('plusAssign': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('plusAssign': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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@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@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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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 d2f2cd4b909..01a4059fe8d 100644
--- a/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
+++ b/compiler/testData/diagnostics/tests/generics/varProjection/setterProjectedOutPlusAssignDefined.lazy.log
@@ -18,25 +18,79 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plusAssign': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plusAssign': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plusAssign': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plusAssign': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('plus': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('plus': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log b/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
index 2f49447d5da..99c385fa36b 100644
--- a/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
+++ b/compiler/testData/diagnostics/tests/imports/ImportResolutionOrder.lazy.log
@@ -33,3 +33,21 @@ LazyJavaPackageFragment@17['lang'] {
     functions('X': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <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 930b7a4f6b0..bb86fa81a22 100644
--- a/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
+++ b/compiler/testData/diagnostics/tests/imports/RenameOnImport.lazy.log
@@ -29,3 +29,10 @@ LazyJavaPackageFragment@14['lang'] {
     classes('AX': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
index 1974e30e190..ff87911fd3f 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/NoSenselessComparisonForErrorType.lazy.log
@@ -20,10 +20,54 @@ LazyJavaPackageFragment@7['java'] {
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('getErrorType': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('getErrorType': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('getErrorType': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('getErrorType': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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@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 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 2e0087bc90f..059afb3730b 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/SupertypeOfErrorType.lazy.log
@@ -36,7 +36,6 @@ LazyJavaClassDescriptor@34['Date'] {
     nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@37
     nestedClasses('compareTo': Name@38) = null // through LazyJavaClassMemberScope@37
     nestedClasses('equals': Name@41) = null // through LazyJavaClassMemberScope@37
-    properties('compareTo': Name@38) = EmptyList@15[empty] // through LazyJavaClassMemberScope@37
     properties('equals': Name@41) = EmptyList@15[empty] // through LazyJavaClassMemberScope@37
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@47['Date']
@@ -47,7 +46,6 @@ LazyJavaClassDescriptor@48['Serializable'] {
     functions('compareTo': Name@50) = EmptyList@15[empty] // through LazyJavaClassMemberScope@51
     functions('equals': Name@52) = ArrayList@53[1] { DeserializedSimpleFunctionDescriptor@54['equals'] } // through LazyJavaClassMemberScope@51
     memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@51
-    properties('compareTo': Name@38) = EmptyList@15[empty] // through LazyJavaClassMemberScope@51
     properties('equals': Name@41) = EmptyList@15[empty] // through LazyJavaClassMemberScope@51
     typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
 }
@@ -177,28 +175,28 @@ LazyJavaClassifierType@113['T'] {
 
 LazyJavaClassifierType@116['T'] {
     arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@105['T']
+    classifier = JavaTypeParameterImpl@115['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@118['T'] {
     arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@112['T']
+    classifier = JavaTypeParameterImpl@105['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@120['T'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@115['T']
+    classifier = JavaTypeParameterImpl@109['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
 LazyJavaClassifierType@122['T'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@109['T']
+    classifier = JavaTypeParameterImpl@112['T']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
 }
@@ -260,42 +258,128 @@ LazyJavaPackageFragment@143['java'] {
 LazyJavaPackageFragment@147['lang'] {
     classes('U': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('comparator': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('compareTo': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('equals': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('minus': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('times': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@179
     deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@179
     functions('comparator': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('compareTo': Name@38) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     functions('equals': Name@41) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('minus': Name@181) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('times': Name@182) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@179
+    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@179
 }
 
 LazyJavaPackageFragment@156['util'] {
-    classes('Comparator': Name@184) = LazyJavaClassDescriptor@4['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@185
-    classes('Date': Name@186) = LazyJavaClassDescriptor@34['Date'] // through LazyPackageFragmentScopeForJavaPackage@185
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('Comparator': Name@187) = ArrayList@188[1] { SamConstructorDescriptor@189['Comparator'] } // through LazyPackageFragmentScopeForJavaPackage@185
-    functions('Date': Name@190) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
-    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('Comparator': Name@182) = LazyJavaClassDescriptor@4['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@183
+    classes('Date': Name@184) = LazyJavaClassDescriptor@34['Date'] // through LazyPackageFragmentScopeForJavaPackage@183
+    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@183
+    functions('Comparator': Name@185) = ArrayList@186[1] { SamConstructorDescriptor@187['Comparator'] } // through LazyPackageFragmentScopeForJavaPackage@183
+    functions('Date': Name@188) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
+    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@183
 }
 
 LazyJavaTypeParameterDescriptor@58['T'] {
-    defaultType = JetTypeImpl@192['T']
+    defaultType = JetTypeImpl@190['T']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    upperBounds = LinkedHashSet@193[1] { NullableType@194 }
+    upperBounds = LinkedHashSet@191[1] { NullableType@192 }
+}
+
+LazyJavaTypeParameterResolver@193 {
+    resolve(JavaTypeParameterImpl@194['T']) = LazyJavaTypeParameterDescriptor@58['T']
 }
 
 LazyJavaTypeParameterResolver@195 {
-    resolve(JavaTypeParameterImpl@196['T']) = LazyJavaTypeParameterDescriptor@58['T']
+    resolve(JavaTypeParameterImpl@112['T']) = null
 }
 
-LazyJavaTypeParameterResolver@197 {
-    resolve(JavaTypeParameterImpl@109['T']) = null
-}
-
-LazyJavaTypeParameterResolver@198 {
+LazyJavaTypeParameterResolver@196 {
     resolve(JavaTypeParameterImpl@115['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> = EmptyList@15[empty]
+}
+
+ResolutionTaskHolder@204 {
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@206 }
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@206 }
+    <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@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[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, ... }
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
index bfbd43e0401..e71b6dcdca7 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/arrayBracketsRange.lazy.log
@@ -29,21 +29,91 @@ LazyJavaPackageFragment@11['java'] {
 
 LazyJavaPackageFragment@13['lang'] {
     classes('arrayOfNulls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('hasNext': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('iterator': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('next': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('rangeTo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('set': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('size': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@30
     deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
     functions('arrayOfNulls': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('get': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('hasNext': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('iterator': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('next': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('rangeTo': Name@35) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('set': Name@36) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('size': Name@37) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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@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> = 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@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 }
+}
+
+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 }
+}
+
+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[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
+    <name not found> = ArrayList@97[7] { ResolutionCandidate@94, ResolutionCandidate@95, ResolutionCandidate@96, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
index 334706724b4..8e813df517f 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/checkNothingIsSubtype.lazy.log
@@ -41,3 +41,17 @@ LazyJavaPackageFragment@17['lang'] {
     functions('infer': Name@37) = EmptyList@35[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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
index 7e950ff7558..d4034049571 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/controlStructuresErrors.lazy.log
@@ -36,54 +36,422 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('l': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('map': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('n': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('q': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('rr': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('t': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('u': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('w': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('a': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('it': Name@47) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('l': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('map': Name@37) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('n': Name@49) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('q': Name@39) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('rr': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('t': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('u': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('w': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('rr': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('a': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('it': Name@43) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('l': Name@44) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('map': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('n': Name@45) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('rr': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@50) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('AA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('it': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('l': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('map': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('n': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('q': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('rr': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('t': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('u': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('w': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@44 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('a': Name@45) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('it': Name@47) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('l': Name@48) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('map': Name@37) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('n': Name@49) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('q': Name@39) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('rr': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('t': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('u': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('w': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('AA': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('it': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('l': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('map': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('n': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('rr': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('a': Name@41) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('it': Name@43) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('l': Name@44) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('map': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('n': Name@45) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('rr': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@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[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 }
+}
+
+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 }
+}
+
+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]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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 {
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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@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 1296b8a6e74..7489b54dd54 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/arrayExpression.lazy.log
@@ -24,10 +24,28 @@ LazyJavaPackageFragment@9['java'] {
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('get': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('names': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('get': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('names': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+}
+
+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@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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
index 153aeefbe59..bce2de3ec18 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.lazy.log
@@ -41,12 +41,247 @@ LazyJavaPackageFragment@16['lang'] {
     classes('area': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('set': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('size': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('times': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('value': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('value': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
     deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
     functions('Square': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     functions('set': Name@41) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('times': Name@43) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('value': Name@45) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('value': Name@44) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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]
+    <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]
+}
+
+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@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { 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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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 135d604ec87..f667cebf7d0 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/completeFunctionArgumentsOfNestedCalls.lazy.log
@@ -23,3 +23,91 @@ LazyJavaPackageFragment@7['lang'] {
     functions('plus': Name@19) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+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> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@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@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@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@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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
index 5eb9d9b8342..904c9b60444 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteEnumReference.lazy.log
@@ -24,3 +24,16 @@ LazyJavaPackageFragment@5['java'] {
 LazyJavaPackageFragment@7['lang'] {
     deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
index dddb9ec02e1..0eda65e4551 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/incompleteWhen.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 4e4a91634df..20b6ed1de09 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@18['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@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['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@35['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
 }
@@ -148,3 +148,53 @@ LazyJavaPackageFragment@64['lang'] {
     functions('getMap': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@86
 }
+
+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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <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@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]
+    <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, ... }
+    <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 e3fd4c641bd..9a8ece7e218 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/inExpr.lazy.log
@@ -18,3 +18,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 ea2f9b1815a..8bcbb4f2409 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteAssignment.lazy.log
@@ -158,42 +158,42 @@ LazyJavaClassifierType@83['String'] {
 
 LazyJavaClassifierType@86['String'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@76['String']
+    classifier = JavaClassImpl@79['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@88['String'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaClassImpl@79['String']
+    classifier = JavaClassImpl@73['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@90['String'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@70['String']
+    classifier = JavaClassImpl@54['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@92['String'] {
     arguments = ArrayList@93[empty]
-    classifier = JavaClassImpl@82['String']
+    classifier = JavaClassImpl@76['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@94['String'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@58['String']
+    classifier = JavaClassImpl@61['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@96['String'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@67['String']
+    classifier = JavaClassImpl@70['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
@@ -207,28 +207,28 @@ LazyJavaClassifierType@98['String'] {
 
 LazyJavaClassifierType@100['String'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@54['String']
+    classifier = JavaClassImpl@85['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@102['String'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@61['String']
+    classifier = JavaClassImpl@82['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@104['String'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@73['String']
+    classifier = JavaClassImpl@58['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
 
 LazyJavaClassifierType@106['String'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@85['String']
+    classifier = JavaClassImpl@67['String']
     nullable = 'true': Boolean@47
     typeConstructor = DeserializedClassTypeConstructor@55
 }
@@ -320,58 +320,321 @@ LazyJavaPackageFragment@129['lang'] {
     classes('AssertionError': Name@178) = LazyJavaClassDescriptor@17['AssertionError'] // through LazyPackageFragmentScopeForJavaPackage@179
     classes('assertEquals': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@179
     classes('equals': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('hasNext': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('minus': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('plus': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('res': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('sum': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('test': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('res': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('sum': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@179
+    classes('test': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@179
     deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@179
     functions('AssertionError': Name@178) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     functions('assertEquals': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
     functions('equals': Name@181) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('hasNext': Name@182) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('iterator': Name@183) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('minus': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('next': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('plus': Name@186) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('res': Name@190) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('sum': Name@188) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('test': Name@189) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('res': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('sum': Name@183) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    functions('test': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@179
+    memberIndex = computeMemberIndex$1@186 // through LazyPackageFragmentScopeForJavaPackage@179
 }
 
 LazyJavaPackageFragment@139['util'] {
-    classes('Any': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('Array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('Arrays': Name@195) = LazyJavaClassDescriptor@1['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('AssertionError': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('Int': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('IntArray': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('String': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('assertEquals': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('equals': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('hasNext': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('minus': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('plus': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('res': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('sum': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    classes('test': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('AssertionError': Name@178) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('assertEquals': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('equals': Name@181) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('hasNext': Name@182) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('iterator': Name@183) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('minus': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('next': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('plus': Name@186) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('res': Name@190) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('sum': Name@188) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('test': Name@189) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@193
-    memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@193
+    classes('Any': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('Array': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('Arrays': Name@190) = LazyJavaClassDescriptor@1['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('AssertionError': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('Int': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('IntArray': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('String': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('assertEquals': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('equals': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('res': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('sum': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    classes('test': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@188
+    deserializedPackageScope = Empty@174 // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('AssertionError': Name@178) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('assertEquals': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('equals': Name@181) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('res': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('sum': Name@183) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    functions('test': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@188
+    memberIndex = computeMemberIndex$1@194 // through LazyPackageFragmentScopeForJavaPackage@188
+}
+
+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> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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]
+    <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 }
+    <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 }
+    <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@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@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@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@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@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> = 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[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]
+}
+
+ResolutionTaskHolder@333 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@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 {
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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 15d755f6861..5c87ac05c01 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/incompleteEquals.lazy.log
@@ -22,3 +22,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+    <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 4fc540ae737..ab48579d4f5 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/kt2014.lazy.log
@@ -35,13 +35,235 @@ LazyJavaPackageFragment@15['lang'] {
     classes('bar': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('c': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('invoke': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('prop': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
     deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
     functions('R': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     functions('a': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     functions('bar': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     functions('c': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     functions('invoke': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('prop': Name@35) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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]
+}
+
+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@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 }
+}
+
+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@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@81 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 ad9fa4841d0..69a74e8a885 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/kt4866UnresolvedArrayAccess.lazy.log
@@ -16,25 +16,72 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('get': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('get': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('foo': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('get': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('get': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('foo': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+}
+
+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]
+    <name not found> = EmptyList@21[empty]
+    <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]
+    <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 6d636119e7c..13427eebe65 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/plusOnTheRight.lazy.log
@@ -25,3 +25,41 @@ LazyJavaPackageFragment@9['lang'] {
     functions('plus': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
index 113119b70e5..06e8d93486f 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/pseudocodeTraverseNextInstructions.lazy.log
@@ -25,3 +25,39 @@ LazyJavaPackageFragment@9['lang'] {
     functions('collection': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 3a9c4e595bd..702cc9a2a79 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/senselessComparisonWithNull.lazy.log
@@ -29,3 +29,53 @@ LazyJavaPackageFragment@9['lang'] {
     functions('invoke': Name@24) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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> = 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]
+}
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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/typeParameterOnLhsOfDot.lazy.log b/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
index 44b3c2dd129..0dc870c5a65 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/typeParameterOnLhsOfDot.lazy.log
@@ -23,3 +23,105 @@ LazyJavaPackageFragment@8['java'] {
 LazyJavaPackageFragment@10['lang'] {
     deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 6f8a4eb033b..37dab97696b 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedArguments.lazy.log
@@ -49,3 +49,93 @@ LazyJavaPackageFragment@9['lang'] {
     functions('rrr': Name@30) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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 }
+    <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@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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+}
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 e4d89c138dc..1eff0e46581 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/unresolvedOperation.lazy.log
@@ -16,29 +16,108 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('bbb': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('not': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('plus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bbb': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('not': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('plus': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('bbb': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('bbb': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('not': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bbb': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('not': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('bbb': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('bbb': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+}
+
+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]
+    <name not found> = EmptyList@21[empty]
+    <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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@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 51584706d9b..7af3ed0f364 100644
--- a/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
+++ b/compiler/testData/diagnostics/tests/incompleteCode/variableDeclarationInSelector.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 c551fe4ccbc..17bd783ff01 100644
--- a/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/NoInferenceFromDeclaredBounds.lazy.log
@@ -43,3 +43,26 @@ LazyJavaPackageFragment@9['lang'] {
     functions('sure': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log b/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
index 1215ad2d355..d4e1a450738 100644
--- a/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/arrayConstructor.lazy.log
@@ -33,3 +33,60 @@ LazyJavaPackageFragment@13['lang'] {
     functions('Array': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <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]
+    <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 }
+}
+
+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@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/inference/cannotCompleteResolveAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
index f48a33eaf3d..15027949c96 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveAmbiguity.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
 }
@@ -146,3 +146,30 @@ LazyJavaPackageFragment@64['lang'] {
     functions('g': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
+
+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]
+    <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, ... }
+    <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 03e4f33df4a..3966a870261 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveFunctionLiteralsNoUse.lazy.log
@@ -43,3 +43,12 @@ LazyJavaPackageFragment@18['lang'] {
     functions('h': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
index 114e063a555..b14bc4ac23a 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoInfoForParameter.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
 }
@@ -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
 }
@@ -148,3 +148,48 @@ LazyJavaPackageFragment@64['lang'] {
     functions('f': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@86
 }
+
+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]
+    <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]
+    <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]
+    <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, ... }
+    <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 a1c6492fc3a..704f53229fe 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveNoneApplicable.lazy.log
@@ -45,3 +45,31 @@ LazyJavaPackageFragment@19['lang'] {
     functions('f': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
 }
+
+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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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/cannotCompleteResolveWithFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
index 01623fb6980..2dc425f5982 100644
--- a/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/cannotCompleteResolveWithFunctionLiterals.lazy.log
@@ -42,3 +42,21 @@ LazyJavaPackageFragment@16['lang'] {
     functions('h': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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 }
+    <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/completeInferenceIfManyFailed.lazy.log b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
index b0b0c9cbcf4..80fc61b2058 100644
--- a/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/completeInferenceIfManyFailed.lazy.log
@@ -37,3 +37,31 @@ LazyJavaPackageFragment@15['lang'] {
     functions('joinT': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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/conflictingSubstitutions.lazy.log b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
index 9e7ce6659c0..bcf07dd039f 100644
--- a/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/conflictingSubstitutions.lazy.log
@@ -2,59 +2,54 @@ 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['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+LazyJavaClassDescriptor@9['AbstractList'] {
+    defaultType = JetTypeImpl@10['AbstractList<1>']
+    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
-LazyJavaClassDescriptor@21['ArrayList'] {
-    constructors = ArrayList@22[3] { JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'], JavaConstructorDescriptor@25['<init>'] } // through LazyJavaClassMemberScope@26
-    defaultType = JetTypeImpl@27['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@26
+LazyJavaClassDescriptor@19['ArrayList'] {
+    constructors = ArrayList@20[3] { JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
+    defaultType = JetTypeImpl@25['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
     functionTypeForSamInterface = null
-    functions('add': Name@7) = ArrayList@29[2] { JavaMethodDescriptor@30['add'], JavaMethodDescriptor@31['add'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@26
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@26
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['ArrayList']
+    functions('add': Name@27) = ArrayList@28[2] { JavaMethodDescriptor@29['add'], JavaMethodDescriptor@30['add'] } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
+    nestedClasses('add': Name@27) = null // through LazyJavaClassMemberScope@24
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@34['ArrayList']
 }
 
-LazyJavaClassDescriptor@36['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
+LazyJavaClassDescriptor@35['RandomAccess'] {
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
     memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
     typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
 }
 
 LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
     memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
     typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
     supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
+LazyJavaClassTypeConstructor@18['AbstractList'] {
     parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
     supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@35['ArrayList'] {
+LazyJavaClassTypeConstructor@34['ArrayList'] {
     parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
     supertypes = ArrayList@55[5] { LazyJavaClassifierType@56['AbstractList<E>'], LazyJavaClassifierType@57['List<E>'], LazyJavaClassifierType@58['RandomAccess'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@51['AbstractCollection<E>'] {
     arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
     classifier = JavaClassImpl@66['AbstractCollection']
     memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@56['AbstractList<E>'] {
     arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
     classifier = JavaClassImpl@70['AbstractList']
     memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
 LazyJavaClassifierType@72['Cloneable'] {
@@ -138,7 +133,7 @@ LazyJavaClassifierType@105['E'] {
     arguments = ArrayList@106[empty]
     classifier = JavaTypeParameterImpl@107['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@108['E'] {
@@ -152,133 +147,133 @@ LazyJavaClassifierType@111['E'] {
     arguments = ArrayList@112[empty]
     classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
-LazyJavaClassifierType@114['E'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaTypeParameterImpl@116['E']
+LazyJavaClassifierType@115['E'] {
+    arguments = ArrayList@116[empty]
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@121['E'] {
     arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@123['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@116['E']
-    nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
     classifier = JavaTypeParameterImpl@110['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
+LazyJavaClassifierType@135['E'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@113['E']
+    nullable = 'true': Boolean@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+}
+
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@52['List<E>'] {
@@ -356,9 +351,9 @@ LazyJavaPackageFragmentProvider@178 {
     packageFragments('kotlin.io': FqName@211) = null
     packageFragments('kotlin.jvm': FqName@212) = null
     topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@213['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@36['RandomAccess']
+    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
+    topLevelClasses(JavaClassImpl@213['ArrayList']) = LazyJavaClassDescriptor@19['ArrayList']
+    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
     topLevelClasses(JavaClassImpl@177['Serializable']) = LazyJavaClassDescriptor@40['Serializable']
 }
 
@@ -366,69 +361,65 @@ LazyJavaPackageFragment@191['java'] {
     classes('lang': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@215
     classes('util': Name@216) = null // through LazyPackageFragmentScopeForJavaPackage@215
     deserializedPackageScope = Empty@217 // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('lang': Name@218) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@215
-    functions('util': Name@219) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('lang': Name@218) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('util': Name@219) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@215
     memberIndex = computeMemberIndex$1@220 // through LazyPackageFragmentScopeForJavaPackage@215
 }
 
 LazyJavaPackageFragment@195['lang'] {
     classes('ArrayList': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@222
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@222
     classes('elemAndList': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@222
     classes('elemAndListWithReceiver': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@222
     classes('list': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@222
     deserializedPackageScope = Empty@217 // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('ArrayList': Name@221) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('elemAndList': Name@223) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('elemAndListWithReceiver': Name@224) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
-    functions('list': Name@225) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@222
+    functions('ArrayList': Name@221) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
+    functions('elemAndList': Name@223) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
+    functions('elemAndListWithReceiver': Name@224) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
+    functions('list': Name@225) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@222
     memberIndex = computeMemberIndex$1@226 // through LazyPackageFragmentScopeForJavaPackage@222
 }
 
 LazyJavaPackageFragment@201['util'] {
-    classes('ArrayList': Name@227) = LazyJavaClassDescriptor@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@228
+    classes('ArrayList': Name@227) = LazyJavaClassDescriptor@19['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@228
     classes('MutableList': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@228
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('elemAndList': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('elemAndListWithReceiver': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@228
     classes('list': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@228
     deserializedPackageScope = Empty@217 // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('ArrayList': Name@221) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('elemAndList': Name@223) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('elemAndListWithReceiver': Name@224) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
-    functions('list': Name@225) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('ArrayList': Name@221) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('elemAndList': Name@223) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('elemAndListWithReceiver': Name@224) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
+    functions('list': Name@225) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@228
     memberIndex = computeMemberIndex$1@230 // through LazyPackageFragmentScopeForJavaPackage@228
 }
 
 LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@231['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@232[1] { NullableType@233 }
     upperBoundsAsType = NullableType@233
 }
 
 LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@234['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
     upperBounds = LinkedHashSet@235[1] { NullableType@236 }
     upperBoundsAsType = NullableType@236
 }
 
 LazyJavaTypeParameterDescriptor@49['E'] {
     defaultType = JetTypeImpl@237['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
     upperBounds = LinkedHashSet@238[1] { NullableType@239 }
     upperBoundsAsType = NullableType@239
 }
 
 LazyJavaTypeParameterResolver@240 {
-    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@241['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@242 {
-    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@243['E']) = LazyJavaTypeParameterDescriptor@49['E']
 }
 
 LazyJavaTypeParameterResolver@244 {
@@ -436,21 +427,134 @@ LazyJavaTypeParameterResolver@244 {
 }
 
 LazyJavaTypeParameterResolver@246 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
+    resolve(JavaTypeParameterImpl@123['E']) = null
 }
 
 LazyJavaTypeParameterResolver@247 {
-    resolve(JavaTypeParameterImpl@116['E']) = null
+    resolve(JavaTypeParameterImpl@110['E']) = null
 }
 
 LazyJavaTypeParameterResolver@248 {
-    resolve(JavaTypeParameterImpl@126['E']) = null
-}
-
-LazyJavaTypeParameterResolver@249 {
     resolve(JavaTypeParameterImpl@113['E']) = null
 }
 
-LazyJavaTypeParameterResolver@250 {
-    resolve(JavaTypeParameterImpl@96['E']) = null
+LazyJavaTypeParameterResolver@249 {
+    resolve(JavaTypeParameterImpl@120['E']) = null
+}
+
+LazyJavaTypeParameterResolver@250 {
+    resolve(JavaTypeParameterImpl@107['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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@259 {
+    <name not found> = ArrayList@260[1] { ResolutionCandidate@261 }
+    <name not found> = ArrayList@262[1] { ResolutionCandidate@261 }
+    <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@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@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[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 }
+    <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 66355d2eb2a..3b1d9d65dfc 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/constraintOnFunctionLiteral.lazy.log
@@ -122,26 +122,26 @@ LazyJavaClassifierType@82['E'] {
     arguments = ArrayList@83[empty]
     classifier = JavaTypeParameterImpl@84['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'false': Boolean@59
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@81['E']
+    classifier = JavaTypeParameterImpl@87['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@84['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
@@ -155,16 +155,16 @@ LazyJavaClassifierType@93['E'] {
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@97['E'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@84['E']
+    classifier = JavaTypeParameterImpl@81['E']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@32['List<E>'] {
@@ -267,14 +267,14 @@ LazyJavaClassifierType@135['Throwable'] {
 
 LazyJavaClassifierType@138['Throwable'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@134['Throwable']
+    classifier = JavaClassImpl@130['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
 
 LazyJavaClassifierType@140['Throwable'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@130['Throwable']
+    classifier = JavaClassImpl@134['Throwable']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@131
 }
@@ -381,21 +381,176 @@ LazyJavaTypeParameterDescriptor@34['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@25['E']
+    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@84['E']) = LazyJavaTypeParameterDescriptor@29['E']
+    resolve(JavaTypeParameterImpl@221['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@34['E']
+LazyJavaTypeParameterResolver@222 {
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@29['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]
+    <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]
+    <name not found> = EmptyList@201[empty]
+    <name not found> = EmptyList@201[empty]
+    <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]
+    <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@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
+    <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@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@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[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]
+    <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@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, ... }
+    <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 3f5df161bd3..7c2d0b5eb4a 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/equalityConstraintOnNullableType.lazy.log
@@ -40,21 +40,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
 }
@@ -175,3 +175,150 @@ LazyJavaPackageFragment@60['lang'] {
     functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@98
 }
+
+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]
+    <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 }
+    <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@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]
+    <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@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 }
+}
+
+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[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]
+    <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, ... }
+    <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 bfd9b21953f..0f4a0fd0a6b 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/notNullConstraintOnNullableType.lazy.log
@@ -38,14 +38,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
 }
@@ -194,3 +194,134 @@ LazyJavaPackageFragment@63['lang'] {
     functions('doT': Name@103) = EmptyList@106[empty] // through LazyPackageFragmentScopeForJavaPackage@113
     memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
 }
+
+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]
+    <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 }
+    <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@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@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 {
+    <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> = 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, ... }
+    <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 e72ab99c6f7..e28c8f0c1ec 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@15['String']
+    classifier = JavaClassImpl@23['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@20['String']
+    classifier = JavaClassImpl@15['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@37['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@37['Throwable']
+    classifier = JavaClassImpl@40['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -179,3 +179,150 @@ LazyJavaPackageFragment@61['lang'] {
     functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
 }
+
+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]
+    <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]
+    <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]
+    <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@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 }
+}
+
+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[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]
+    <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, ... }
+    <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 6377010736b..272497069c9 100644
--- a/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/constraints/supertypeConstraintOnNullableType.lazy.log
@@ -179,3 +179,150 @@ LazyJavaPackageFragment@61['lang'] {
     functions('foo': Name@92) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@102
     memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
 }
+
+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]
+    <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]
+    <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]
+    <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@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 }
+}
+
+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[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]
+    <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, ... }
+    <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 4fdc7d3b8db..35ee1ad30df 100644
--- a/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/dependOnExpectedType.lazy.log
@@ -6,59 +6,54 @@ LazyJavaClassDescriptor@2['AbstractCollection'] {
     defaultType = JetTypeImpl@3['AbstractCollection<1>']
     functions('add': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['add'] } // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@13['AbstractList'] {
-    defaultType = JetTypeImpl@14['AbstractList<1>']
-    functions('add': Name@15) = ArrayList@16[2] { JavaMethodDescriptor@17['add'], JavaMethodDescriptor@18['add'] } // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+LazyJavaClassDescriptor@11['AbstractList'] {
+    defaultType = JetTypeImpl@12['AbstractList<1>']
+    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
 }
 
-LazyJavaClassDescriptor@23['ArrayList'] {
-    constructors = ArrayList@24[3] { JavaConstructorDescriptor@25['<init>'], JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'] } // through LazyJavaClassMemberScope@28
-    defaultType = JetTypeImpl@29['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@28
+LazyJavaClassDescriptor@21['ArrayList'] {
+    constructors = ArrayList@22[3] { JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'], JavaConstructorDescriptor@25['<init>'] } // through LazyJavaClassMemberScope@26
+    defaultType = JetTypeImpl@27['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@26
     functionTypeForSamInterface = null
-    functions('add': Name@9) = ArrayList@31[2] { JavaMethodDescriptor@32['add'], JavaMethodDescriptor@33['add'] } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@28
-    nestedClasses('add': Name@9) = null // through LazyJavaClassMemberScope@28
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@37['ArrayList']
+    functions('add': Name@29) = ArrayList@30[2] { JavaMethodDescriptor@31['add'], JavaMethodDescriptor@32['add'] } // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@26
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@26
+    nestedClasses('add': Name@29) = null // through LazyJavaClassMemberScope@26
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@36['ArrayList']
 }
 
-LazyJavaClassDescriptor@38['RandomAccess'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@39
+LazyJavaClassDescriptor@37['RandomAccess'] {
+    functions('add': Name@13) = EmptyList@38[empty] // through LazyJavaClassMemberScope@39
     memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@39
     typeConstructor = LazyJavaClassTypeConstructor@41['RandomAccess']
 }
 
 LazyJavaClassDescriptor@42['Serializable'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@43
+    functions('add': Name@13) = EmptyList@38[empty] // through LazyJavaClassMemberScope@43
     memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@43
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@43
     typeConstructor = LazyJavaClassTypeConstructor@45['Serializable']
 }
 
-LazyJavaClassTypeConstructor@12['AbstractCollection'] {
+LazyJavaClassTypeConstructor@10['AbstractCollection'] {
     parameters = ArrayList@46[1] { LazyJavaTypeParameterDescriptor@47['E'] }
     supertypes = ArrayList@48[1] { LazyJavaClassifierType@49['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@22['AbstractList'] {
+LazyJavaClassTypeConstructor@20['AbstractList'] {
     parameters = ArrayList@50[1] { LazyJavaTypeParameterDescriptor@51['E'] }
     supertypes = ArrayList@52[2] { LazyJavaClassifierType@53['AbstractCollection<E>'], LazyJavaClassifierType@54['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@37['ArrayList'] {
+LazyJavaClassTypeConstructor@36['ArrayList'] {
     parameters = ArrayList@55[1] { LazyJavaTypeParameterDescriptor@56['E'] }
     supertypes = ArrayList@57[5] { LazyJavaClassifierType@58['AbstractList<E>'], LazyJavaClassifierType@59['List<E>'], LazyJavaClassifierType@60['RandomAccess'], ... }
 }
@@ -77,14 +72,14 @@ LazyJavaClassifierType@53['AbstractCollection<E>'] {
     arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
     classifier = JavaClassImpl@68['AbstractCollection']
     memberScope = SubstitutingScope@69
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
 LazyJavaClassifierType@58['AbstractList<E>'] {
     arguments = ArrayList@70[1] { TypeProjectionImpl@71 }
     classifier = JavaClassImpl@72['AbstractList']
     memberScope = SubstitutingScope@73
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
 }
 
 LazyJavaClassifierType@74['Cloneable'] {
@@ -128,49 +123,49 @@ LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
-LazyJavaClassifierType@103['E'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+LazyJavaClassifierType@104['E'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaTypeParameterImpl@106['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@107['E'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
-LazyJavaClassifierType@110['E'] {
-    arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
-LazyJavaClassifierType@113['E'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['E']
+LazyJavaClassifierType@114['E'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@117['E'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@120['E'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@123['E'] {
@@ -184,56 +179,56 @@ LazyJavaClassifierType@126['E'] {
     arguments = ArrayList@127[empty]
     classifier = JavaTypeParameterImpl@128['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@129['E'] {
     arguments = ArrayList@130[empty]
     classifier = JavaTypeParameterImpl@131['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@132['E'] {
     arguments = ArrayList@133[empty]
     classifier = JavaTypeParameterImpl@134['E']
     nullable = 'false': Boolean@84
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@119['E']
+    classifier = JavaTypeParameterImpl@98['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@128['E']
+    classifier = JavaTypeParameterImpl@134['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@122['E']
+    classifier = JavaTypeParameterImpl@113['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@102['E']
+    classifier = JavaTypeParameterImpl@128['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@134['E']
+    classifier = JavaTypeParameterImpl@122['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@145['E'] {
@@ -245,54 +240,54 @@ LazyJavaClassifierType@145['E'] {
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@112['E']
+    classifier = JavaTypeParameterImpl@106['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@131['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@109['E']
+    classifier = JavaTypeParameterImpl@131['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+    classifier = JavaTypeParameterImpl@116['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
 }
 
 LazyJavaClassifierType@157['E'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@115['E']
+    classifier = JavaTypeParameterImpl@109['E']
     nullable = 'true': Boolean@90
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
-LazyJavaClassifierType@59['List<E>'] {
+LazyJavaClassifierType@54['List<E>'] {
     arguments = ArrayList@159[1] { TypeProjectionImpl@160 }
     classifier = JavaClassImpl@161['List']
     memberScope = SubstitutingScope@162
     typeConstructor = DeserializedClassTypeConstructor@163
 }
 
-LazyJavaClassifierType@54['List<E>'] {
+LazyJavaClassifierType@59['List<E>'] {
     arguments = ArrayList@164[1] { TypeProjectionImpl@165 }
     classifier = JavaClassImpl@166['List']
     memberScope = SubstitutingScope@167
@@ -384,10 +379,10 @@ LazyJavaPackageFragmentProvider@180 {
     packageFragments('kotlin.io': FqName@238) = null
     packageFragments('kotlin.jvm': FqName@239) = null
     topLevelClasses(JavaClassImpl@68['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@72['AbstractList']) = LazyJavaClassDescriptor@13['AbstractList']
-    topLevelClasses(JavaClassImpl@240['ArrayList']) = LazyJavaClassDescriptor@23['ArrayList']
+    topLevelClasses(JavaClassImpl@72['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
+    topLevelClasses(JavaClassImpl@240['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
     topLevelClasses(JavaClassImpl@241['List']) = LazyJavaClassDescriptor@242['List']
-    topLevelClasses(JavaClassImpl@176['RandomAccess']) = LazyJavaClassDescriptor@38['RandomAccess']
+    topLevelClasses(JavaClassImpl@176['RandomAccess']) = LazyJavaClassDescriptor@37['RandomAccess']
     topLevelClasses(JavaClassImpl@179['Serializable']) = LazyJavaClassDescriptor@42['Serializable']
 }
 
@@ -395,115 +390,464 @@ LazyJavaPackageFragment@203['java'] {
     classes('lang': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@244
     classes('util': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@244
     deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('lang': Name@247) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@244
-    functions('util': Name@248) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@244
+    functions('lang': Name@247) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@244
+    functions('util': Name@248) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@244
     memberIndex = computeMemberIndex$1@249 // through LazyPackageFragmentScopeForJavaPackage@244
 }
 
 LazyJavaPackageFragment@207['lang'] {
     classes('ArrayList': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('add': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@251
     classes('both': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@251
     classes('elem': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@251
     classes('elemAndList': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('get': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('id': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('id1': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('list': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@251
-    classes('newList': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@251
+    classes('id': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@251
+    classes('id1': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@251
+    classes('list': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@251
+    classes('newList': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@251
     deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('ArrayList': Name@250) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('add': Name@9) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('both': Name@252) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('elem': Name@253) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('elemAndList': Name@254) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('get': Name@255) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('id': Name@256) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('id1': Name@257) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('list': Name@258) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    functions('newList': Name@259) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@251
-    memberIndex = computeMemberIndex$1@260 // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('ArrayList': Name@250) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('both': Name@252) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('elem': Name@253) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('elemAndList': Name@254) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('id': Name@255) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('id1': Name@256) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('list': Name@257) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    functions('newList': Name@258) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@251
+    memberIndex = computeMemberIndex$1@259 // through LazyPackageFragmentScopeForJavaPackage@251
 }
 
 LazyJavaPackageFragment@218['util'] {
-    classes('ArrayList': Name@261) = LazyJavaClassDescriptor@23['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Comparable': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Int': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('List': Name@265) = LazyJavaClassDescriptor@242['List'] // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('Long': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('String': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('add': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('both': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('elem': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('elemAndList': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('get': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('id': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('id1': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('list': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    classes('newList': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@262
-    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('ArrayList': Name@250) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('add': Name@9) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('both': Name@252) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('elem': Name@253) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('elemAndList': Name@254) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('get': Name@255) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('id': Name@256) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('id1': Name@257) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('list': Name@258) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    functions('newList': Name@259) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@262
-    memberIndex = computeMemberIndex$1@268 // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('ArrayList': Name@260) = LazyJavaClassDescriptor@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('Comparable': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('Int': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('List': Name@264) = LazyJavaClassDescriptor@242['List'] // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('Long': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('String': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('both': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('elem': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('elemAndList': Name@254) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('id': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('id1': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('list': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    classes('newList': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@261
+    deserializedPackageScope = Empty@246 // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('ArrayList': Name@250) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('both': Name@252) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('elem': Name@253) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('elemAndList': Name@254) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('id': Name@255) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('id1': Name@256) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('list': Name@257) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    functions('newList': Name@258) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@261
+    memberIndex = computeMemberIndex$1@267 // through LazyPackageFragmentScopeForJavaPackage@261
 }
 
 LazyJavaTypeParameterDescriptor@56['E'] {
-    defaultType = JetTypeImpl@269['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
-    upperBounds = LinkedHashSet@270[1] { NullableType@271 }
-    upperBoundsAsType = NullableType@271
-}
-
-LazyJavaTypeParameterDescriptor@47['E'] {
-    defaultType = JetTypeImpl@272['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@273[1] { NullableType@274 }
-    upperBoundsAsType = NullableType@274
+    defaultType = JetTypeImpl@268['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    upperBounds = LinkedHashSet@269[1] { NullableType@270 }
+    upperBoundsAsType = NullableType@270
 }
 
 LazyJavaTypeParameterDescriptor@51['E'] {
-    defaultType = JetTypeImpl@275['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
-    upperBounds = LinkedHashSet@276[1] { NullableType@277 }
-    upperBoundsAsType = NullableType@277
+    defaultType = JetTypeImpl@271['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    upperBounds = LinkedHashSet@272[1] { NullableType@273 }
+    upperBoundsAsType = NullableType@273
 }
 
-LazyJavaTypeParameterResolver@278 {
-    resolve(JavaTypeParameterImpl@279['E']) = LazyJavaTypeParameterDescriptor@56['E']
+LazyJavaTypeParameterDescriptor@47['E'] {
+    defaultType = JetTypeImpl@274['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    upperBounds = LinkedHashSet@275[1] { NullableType@276 }
+    upperBoundsAsType = NullableType@276
+}
+
+LazyJavaTypeParameterResolver@277 {
+    resolve(JavaTypeParameterImpl@278['E']) = LazyJavaTypeParameterDescriptor@56['E']
+}
+
+LazyJavaTypeParameterResolver@279 {
+    resolve(JavaTypeParameterImpl@125['E']) = LazyJavaTypeParameterDescriptor@47['E']
 }
 
 LazyJavaTypeParameterResolver@280 {
-    resolve(JavaTypeParameterImpl@122['E']) = LazyJavaTypeParameterDescriptor@51['E']
+    resolve(JavaTypeParameterImpl@106['E']) = LazyJavaTypeParameterDescriptor@51['E']
 }
 
 LazyJavaTypeParameterResolver@281 {
-    resolve(JavaTypeParameterImpl@115['E']) = LazyJavaTypeParameterDescriptor@47['E']
-}
-
-LazyJavaTypeParameterResolver@282 {
     resolve(JavaTypeParameterImpl@102['E']) = null
 }
 
+LazyJavaTypeParameterResolver@282 {
+    resolve(JavaTypeParameterImpl@134['E']) = null
+}
+
 LazyJavaTypeParameterResolver@283 {
-    resolve(JavaTypeParameterImpl@109['E']) = null
+    resolve(JavaTypeParameterImpl@131['E']) = null
 }
 
 LazyJavaTypeParameterResolver@284 {
-    resolve(JavaTypeParameterImpl@105['E']) = null
+    resolve(JavaTypeParameterImpl@119['E']) = null
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@112['E']) = null
+    resolve(JavaTypeParameterImpl@98['E']) = null
 }
 
-LazyJavaTypeParameterResolver@286 {
-    resolve(JavaTypeParameterImpl@119['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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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@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@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@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@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+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[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 }
+    <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 cc4ddf13106..f75a39773c3 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVariance.lazy.log
@@ -55,3 +55,899 @@ LazyJavaPackageFragment@17['lang'] {
     functions('writeToMyList': Name@43) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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> = 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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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 }
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@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]
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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@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@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@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@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@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@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@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@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@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@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@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[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 }
+}
+
+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 }
+}
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log b/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
index f3fa3165cad..10c25b55740 100644
--- a/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/dependantOnVarianceNullable.lazy.log
@@ -137,28 +137,28 @@ LazyJavaClassifierType@84['T'] {
     arguments = ArrayList@85[empty]
     classifier = JavaTypeParameterImpl@86['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
-LazyJavaClassifierType@88['T'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@90['T']
+LazyJavaClassifierType@87['T'] {
+    arguments = ArrayList@88[empty]
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@91['T'] {
     arguments = ArrayList@92[empty]
     classifier = JavaTypeParameterImpl@93['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@94['T'] {
     arguments = ArrayList@95[empty]
     classifier = JavaTypeParameterImpl@96['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@97['T'] {
@@ -179,28 +179,28 @@ LazyJavaClassifierType@104['T'] {
     arguments = ArrayList@105[empty]
     classifier = JavaTypeParameterImpl@106['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@107['T'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@110['T'] {
     arguments = ArrayList@111[empty]
     classifier = JavaTypeParameterImpl@112['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@113['T'] {
     arguments = ArrayList@114[empty]
     classifier = JavaTypeParameterImpl@115['T']
     nullable = 'false': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@116['T'] {
@@ -212,44 +212,44 @@ LazyJavaClassifierType@116['T'] {
 
 LazyJavaClassifierType@119['T'] {
     arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@103['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-}
-
-LazyJavaClassifierType@121['T'] {
-    arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@99['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
+LazyJavaClassifierType@121['T'] {
+    arguments = ArrayList@122[empty]
+    classifier = JavaTypeParameterImpl@106['T']
+    nullable = 'true': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
 LazyJavaClassifierType@123['T'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaTypeParameterImpl@93['T']
+    classifier = JavaTypeParameterImpl@103['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@125['T'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@109['T']
+    classifier = JavaTypeParameterImpl@93['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@127['T'] {
     arguments = ArrayList@128[empty]
-    classifier = JavaTypeParameterImpl@96['T']
+    classifier = JavaTypeParameterImpl@112['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@129['T'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaTypeParameterImpl@90['T']
+    classifier = JavaTypeParameterImpl@115['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@131['T'] {
@@ -261,30 +261,30 @@ LazyJavaClassifierType@131['T'] {
 
 LazyJavaClassifierType@133['T'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
-}
-
-LazyJavaClassifierType@135['T'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@115['T']
+    classifier = JavaTypeParameterImpl@86['T']
     nullable = 'true': Boolean@44
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
+LazyJavaClassifierType@135['T'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaTypeParameterImpl@96['T']
+    nullable = 'true': Boolean@44
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+}
+
 LazyJavaClassifierType@137['T'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@86['T']
+    classifier = JavaTypeParameterImpl@89['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@139['T'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@106['T']
+    classifier = JavaTypeParameterImpl@109['T']
     nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@141['T'] {
@@ -367,20 +367,20 @@ LazyJavaPackageFragment@167['util'] {
     memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@196
 }
 
-LazyJavaTypeParameterDescriptor@199['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    upperBounds = LinkedHashSet@200[1] { NullableType@201 }
-    upperBoundsAsType = NullableType@201
-}
-
 LazyJavaTypeParameterDescriptor@26['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    upperBounds = LinkedHashSet@199[1] { NullableType@200 }
+    upperBoundsAsType = NullableType@200
+}
+
+LazyJavaTypeParameterDescriptor@201['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
     upperBounds = LinkedHashSet@202[1] { NullableType@203 }
     upperBoundsAsType = NullableType@203
 }
 
 LazyJavaTypeParameterDescriptor@204['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@205[2] { DelegatingFlexibleType@206, DelegatingFlexibleType@207 }
     upperBoundsAsType = NotNullType@208
 }
@@ -390,13 +390,41 @@ LazyJavaTypeParameterResolver@209 {
 }
 
 LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@199['T']
+    resolve(JavaTypeParameterImpl@212['T']) = LazyJavaTypeParameterDescriptor@204['T']
 }
 
 LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@204['T']
+    resolve(JavaTypeParameterImpl@214['T']) = LazyJavaTypeParameterDescriptor@201['T']
 }
 
 LazyJavaTypeParameterResolver@215 {
     resolve(JavaTypeParameterImpl@99['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@224 {
+    <name not found> = ArrayList@225[1] { ResolutionCandidate@226 }
+    <name not found> = ArrayList@227[1] { ResolutionCandidate@226 }
+}
+
+ResolutionTaskHolder@228 {
+    <name not found> = ArrayList@229[2] { ResolutionCandidate@230, ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[3] { ResolutionCandidate@230, ResolutionCandidate@231, ResolutionCandidate@233 }
+    <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/functionPlaceholderError.lazy.log b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
index e5d20fbe4c0..57c1a2abffe 100644
--- a/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/functionPlaceholderError.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@38['Throwable']
+    classifier = JavaClassImpl@35['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@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -144,3 +144,72 @@ LazyJavaPackageFragment@62['lang'] {
     functions('foo': Name@84) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@82
 }
+
+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]
+    <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@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]
+    <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]
+    <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, ... }
+    <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 d6f3dba98c3..5b49ac2e6b2 100644
--- a/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/hasErrorInConstrainingTypes.lazy.log
@@ -37,3 +37,84 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 c72ae136a21..d67eb5fceaf 100644
--- a/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/immutableArrayList.lazy.log
@@ -150,22 +150,43 @@ LazyJavaPackageFragment@96['p'] {
     memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
-LazyJavaTypeParameterDescriptor@56['T'] {
+LazyJavaTypeParameterDescriptor@52['T'] {
     defaultType = JetTypeImpl@115['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@117[1] { NullableType@118 }
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    upperBounds = LinkedHashSet@116[1] { NullableType@117 }
 }
 
-LazyJavaTypeParameterDescriptor@52['T'] {
-    defaultType = JetTypeImpl@119['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+LazyJavaTypeParameterDescriptor@56['T'] {
+    defaultType = JetTypeImpl@118['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@119
     upperBounds = LinkedHashSet@120[1] { NullableType@121 }
 }
 
 LazyJavaTypeParameterResolver@122 {
-    resolve(JavaTypeParameterImpl@123['T']) = LazyJavaTypeParameterDescriptor@52['T']
+    resolve(JavaTypeParameterImpl@123['T']) = LazyJavaTypeParameterDescriptor@56['T']
 }
 
 LazyJavaTypeParameterResolver@124 {
-    resolve(JavaTypeParameterImpl@125['T']) = LazyJavaTypeParameterDescriptor@56['T']
+    resolve(JavaTypeParameterImpl@125['T']) = LazyJavaTypeParameterDescriptor@52['T']
+}
+
+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]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
index 3099979cbba..b37c4b3d5b8 100644
--- a/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/inferInFunctionLiterals.lazy.log
@@ -93,35 +93,35 @@ LazyJavaClassifierType@57['E'] {
     arguments = ArrayList@58[empty]
     classifier = JavaTypeParameterImpl@59['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+LazyJavaClassifierType@60['E'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'false': Boolean@34
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
 
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+LazyJavaClassifierType@63['E'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@34
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@59['E']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@70['E'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@55['E']
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@72['E'] {
@@ -133,14 +133,14 @@ LazyJavaClassifierType@72['E'] {
 
 LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@59['E']
+    classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@76['E'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
 }
@@ -261,16 +261,16 @@ LazyJavaPackageFragment@119['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@20['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
     upperBounds = LinkedHashSet@156[1] { NullableType@157 }
 }
 
 LazyJavaTypeParameterDescriptor@15['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaTypeParameterDescriptor@11['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterResolver@158 {
@@ -278,9 +278,56 @@ LazyJavaTypeParameterResolver@158 {
 }
 
 LazyJavaTypeParameterResolver@160 {
-    resolve(JavaTypeParameterImpl@161['E']) = LazyJavaTypeParameterDescriptor@11['E']
+    resolve(JavaTypeParameterImpl@161['E']) = LazyJavaTypeParameterDescriptor@15['E']
 }
 
 LazyJavaTypeParameterResolver@162 {
-    resolve(JavaTypeParameterImpl@163['E']) = LazyJavaTypeParameterDescriptor@15['E']
+    resolve(JavaTypeParameterImpl@163['E']) = LazyJavaTypeParameterDescriptor@11['E']
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@144[empty]
+    <name not found> = EmptyList@144[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log b/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
index 15e0775683d..45982eda25d 100644
--- a/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/kt1293.lazy.log
@@ -29,11 +29,61 @@ LazyJavaPackageFragment@7['java'] {
 
 LazyJavaPackageFragment@9['lang'] {
     classes('arrayOfNulls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('get': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('requiresInt': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('requiresInt': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
     deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
     functions('arrayOfNulls': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('get': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('requiresInt': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('requiresInt': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 }
+    <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 {
+    <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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log b/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
index 01ba220626c..380006c2199 100644
--- a/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/kt3184.lazy.log
@@ -12,59 +12,53 @@ LazyJavaClassDescriptor@2['AbstractMap'] {
 LazyJavaClassDescriptor@8['Appendable'] {
     functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
     memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@13['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
 }
 
-LazyJavaClassDescriptor@14['AutoCloseable'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['AutoCloseable']
+LazyJavaClassDescriptor@13['AutoCloseable'] {
+    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
+    typeConstructor = LazyJavaClassTypeConstructor@16['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@18['Closeable'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+LazyJavaClassDescriptor@17['Closeable'] {
+    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
-LazyJavaClassDescriptor@22['FilterOutputStream'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
+LazyJavaClassDescriptor@21['FilterOutputStream'] {
+    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@26['HashMap'] {
-    constructors = ArrayList@27[4] { JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'], JavaConstructorDescriptor@30['<init>'], ... } // through LazyJavaClassMemberScope@31
-    defaultType = JetTypeImpl@32['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@31
+LazyJavaClassDescriptor@25['HashMap'] {
+    constructors = ArrayList@26[4] { JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'], ... } // through LazyJavaClassMemberScope@30
+    defaultType = JetTypeImpl@31['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@30
     functionTypeForSamInterface = null
-    functions('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@31
-    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@31
-    nestedClasses('set': Name@3) = null // through LazyJavaClassMemberScope@31
-    properties('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@31
-    typeConstructor = LazyJavaClassTypeConstructor@36['HashMap']
+    functions('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@30
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@30
+    nestedClasses('set': Name@3) = null // through LazyJavaClassMemberScope@30
+    properties('set': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@30
+    typeConstructor = LazyJavaClassTypeConstructor@35['HashMap']
 }
 
-LazyJavaClassDescriptor@37['OutputStream'] {
-    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@38
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@38
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@38
-    typeConstructor = LazyJavaClassTypeConstructor@40['OutputStream']
+LazyJavaClassDescriptor@36['OutputStream'] {
+    functions('println': Name@9) = EmptyList@4[empty] // through LazyJavaClassMemberScope@37
+    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
+    typeConstructor = LazyJavaClassTypeConstructor@39['OutputStream']
 }
 
-LazyJavaClassDescriptor@41['PrintStream'] {
-    defaultType = JetTypeImpl@42['PrintStream']
-    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@44
-    functions('println': Name@12) = ArrayList@45[10] { JavaMethodDescriptor@46['println'], JavaMethodDescriptor@47['println'], JavaMethodDescriptor@48['println'], ... } // through LazyJavaClassMemberScope@44
-    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@44
-    nestedClassIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@44
-    nestedClasses('println': Name@12) = null // through LazyJavaClassMemberScope@44
-    properties('println': Name@12) = EmptyList@4[empty] // through LazyJavaClassMemberScope@44
+LazyJavaClassDescriptor@40['PrintStream'] {
+    defaultType = JetTypeImpl@41['PrintStream']
+    enumEntryIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@43
+    functions('println': Name@44) = ArrayList@45[10] { JavaMethodDescriptor@46['println'], JavaMethodDescriptor@47['println'], JavaMethodDescriptor@48['println'], ... } // through LazyJavaClassMemberScope@43
+    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@43
+    nestedClassIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@43
+    nestedClasses('println': Name@44) = null // through LazyJavaClassMemberScope@43
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@51['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@52['PrintStream']
 }
@@ -92,32 +86,32 @@ LazyJavaClassTypeConstructor@7['AbstractMap'] {
     supertypes = ArrayList@71[1] { LazyJavaClassifierType@72['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@13['Appendable'] {
+LazyJavaClassTypeConstructor@12['Appendable'] {
     parameters = ArrayList@73[empty]
     supertypes = ArrayList@74[1] { JetTypeImpl@75['Any'] }
 }
 
-LazyJavaClassTypeConstructor@17['AutoCloseable'] {
+LazyJavaClassTypeConstructor@16['AutoCloseable'] {
     parameters = ArrayList@76[empty]
     supertypes = ArrayList@77[1] { JetTypeImpl@75['Any'] }
 }
 
-LazyJavaClassTypeConstructor@21['Closeable'] {
+LazyJavaClassTypeConstructor@20['Closeable'] {
     parameters = ArrayList@78[empty]
     supertypes = ArrayList@79[1] { LazyJavaClassifierType@80['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@25['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@24['FilterOutputStream'] {
     parameters = ArrayList@81[empty]
     supertypes = ArrayList@82[1] { LazyJavaClassifierType@83['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@36['HashMap'] {
+LazyJavaClassTypeConstructor@35['HashMap'] {
     parameters = ArrayList@84[2] { LazyJavaTypeParameterDescriptor@85['K'], LazyJavaTypeParameterDescriptor@86['V'] }
     supertypes = ArrayList@87[4] { LazyJavaClassifierType@88['AbstractMap<K, V>'], LazyJavaClassifierType@89['Map<K, V>'], LazyJavaClassifierType@90['Cloneable'], ... }
 }
 
-LazyJavaClassTypeConstructor@40['OutputStream'] {
+LazyJavaClassTypeConstructor@39['OutputStream'] {
     parameters = ArrayList@91[empty]
     supertypes = ArrayList@92[1] { LazyJavaClassifierType@93['Closeable'] }
 }
@@ -147,14 +141,14 @@ LazyJavaClassifierType@97['Appendable'] {
     arguments = ArrayList@107[empty]
     classifier = JavaClassImpl@108['Appendable']
     memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@13['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Appendable']
 }
 
 LazyJavaClassifierType@80['AutoCloseable'] {
     arguments = ArrayList@109[empty]
     classifier = JavaClassImpl@110['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@15
-    typeConstructor = LazyJavaClassTypeConstructor@17['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@14
+    typeConstructor = LazyJavaClassTypeConstructor@16['AutoCloseable']
 }
 
 LazyJavaClassifierType@90['Cloneable'] {
@@ -167,22 +161,22 @@ LazyJavaClassifierType@90['Cloneable'] {
 LazyJavaClassifierType@98['Closeable'] {
     arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['Closeable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
 LazyJavaClassifierType@93['Closeable'] {
     arguments = ArrayList@117[empty]
     classifier = JavaClassImpl@118['Closeable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
 LazyJavaClassifierType@96['FilterOutputStream'] {
     arguments = ArrayList@119[empty]
     classifier = JavaClassImpl@120['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
 }
 
 LazyJavaClassifierType@121['Flushable'] {
@@ -201,14 +195,14 @@ LazyJavaClassifierType@128['K'] {
     arguments = ArrayList@129[empty]
     classifier = JavaTypeParameterImpl@130['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
-LazyJavaClassifierType@132['K'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@134['K']
+LazyJavaClassifierType@131['K'] {
+    arguments = ArrayList@132[empty]
+    classifier = JavaTypeParameterImpl@133['K']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@135['K'] {
@@ -229,12 +223,12 @@ LazyJavaClassifierType@141['K'] {
     arguments = ArrayList@142[empty]
     classifier = JavaTypeParameterImpl@130['K']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@144['K'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@134['K']
+    classifier = JavaTypeParameterImpl@140['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -248,14 +242,14 @@ LazyJavaClassifierType@146['K'] {
 
 LazyJavaClassifierType@148['K'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@125['K']
+    classifier = JavaTypeParameterImpl@133['K']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaClassifierType@150['K'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@140['K']
+    classifier = JavaTypeParameterImpl@125['K']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -338,14 +332,14 @@ LazyJavaClassifierType@191['Object'] {
 LazyJavaClassifierType@83['OutputStream'] {
     arguments = ArrayList@193[empty]
     classifier = JavaClassImpl@194['OutputStream']
-    memberScope = LazyJavaClassMemberScope@38
-    typeConstructor = LazyJavaClassTypeConstructor@40['OutputStream']
+    memberScope = LazyJavaClassMemberScope@37
+    typeConstructor = LazyJavaClassTypeConstructor@39['OutputStream']
 }
 
 LazyJavaClassifierType@195['PrintStream'] {
     arguments = ArrayList@196[empty]
     classifier = JavaClassImpl@197['PrintStream']
-    memberScope = LazyJavaClassMemberScope@44
+    memberScope = LazyJavaClassMemberScope@43
     nullable = 'false': Boolean@126
     typeConstructor = LazyJavaClassTypeConstructor@52['PrintStream']
 }
@@ -396,14 +390,14 @@ LazyJavaClassifierType@216['V'] {
     arguments = ArrayList@217[empty]
     classifier = JavaTypeParameterImpl@218['V']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
-LazyJavaClassifierType@220['V'] {
-    arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@222['V']
+LazyJavaClassifierType@219['V'] {
+    arguments = ArrayList@220[empty]
+    classifier = JavaTypeParameterImpl@221['V']
     nullable = 'false': Boolean@126
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
 }
 
 LazyJavaClassifierType@223['V'] {
@@ -415,35 +409,35 @@ LazyJavaClassifierType@223['V'] {
 
 LazyJavaClassifierType@226['V'] {
     arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@222['V']
+    classifier = JavaTypeParameterImpl@211['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@228['V'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@225['V']
+    classifier = JavaTypeParameterImpl@215['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@230['V'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@218['V']
+    classifier = JavaTypeParameterImpl@221['V']
     nullable = 'true': Boolean@143
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
 }
 
 LazyJavaClassifierType@232['V'] {
     arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@211['V']
+    classifier = JavaTypeParameterImpl@225['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
 
 LazyJavaClassifierType@234['V'] {
     arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@215['V']
+    classifier = JavaTypeParameterImpl@218['V']
     nullable = 'true': Boolean@143
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
 }
@@ -497,12 +491,12 @@ LazyJavaPackageFragmentProvider@236 {
     packageFragments('kotlin.jvm': FqName@287) = null
     topLevelClasses(JavaClassImpl@105['AbstractMap']) = LazyJavaClassDescriptor@2['AbstractMap']
     topLevelClasses(JavaClassImpl@108['Appendable']) = LazyJavaClassDescriptor@8['Appendable']
-    topLevelClasses(JavaClassImpl@110['AutoCloseable']) = LazyJavaClassDescriptor@14['AutoCloseable']
-    topLevelClasses(JavaClassImpl@116['Closeable']) = LazyJavaClassDescriptor@18['Closeable']
-    topLevelClasses(JavaClassImpl@120['FilterOutputStream']) = LazyJavaClassDescriptor@22['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@288['HashMap']) = LazyJavaClassDescriptor@26['HashMap']
-    topLevelClasses(JavaClassImpl@194['OutputStream']) = LazyJavaClassDescriptor@37['OutputStream']
-    topLevelClasses(JavaClassImpl@197['PrintStream']) = LazyJavaClassDescriptor@41['PrintStream']
+    topLevelClasses(JavaClassImpl@110['AutoCloseable']) = LazyJavaClassDescriptor@13['AutoCloseable']
+    topLevelClasses(JavaClassImpl@116['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']
+    topLevelClasses(JavaClassImpl@197['PrintStream']) = LazyJavaClassDescriptor@40['PrintStream']
     topLevelClasses(JavaClassImpl@202['Serializable']) = LazyJavaClassDescriptor@53['Serializable']
     topLevelClasses(JavaClassImpl@289['System']) = LazyJavaClassDescriptor@57['System']
 }
@@ -522,53 +516,286 @@ LazyJavaPackageFragment@263['lang'] {
     classes('extf': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@298
     classes('invoke': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@298
     classes('println': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('put': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@298
     classes('set': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@298
-    classes('test': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@298
+    classes('test': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@298
     deserializedPackageScope = Empty@293 // through LazyPackageFragmentScopeForJavaPackage@298
     functions('HashMap': Name@297) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
     functions('extf': Name@300) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
     functions('invoke': Name@301) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
     functions('println': Name@302) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('put': Name@303) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
     functions('set': Name@3) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    functions('test': Name@304) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
-    memberIndex = computeMemberIndex$1@305 // through LazyPackageFragmentScopeForJavaPackage@298
+    functions('test': Name@303) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@298
+    memberIndex = computeMemberIndex$1@304 // through LazyPackageFragmentScopeForJavaPackage@298
 }
 
 LazyJavaPackageFragment@274['util'] {
-    classes('HashMap': Name@306) = LazyJavaClassDescriptor@26['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@307
-    deserializedPackageScope = Empty@293 // through LazyPackageFragmentScopeForJavaPackage@307
-    functions('HashMap': Name@308) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@307
-    memberIndex = computeMemberIndex$1@309 // through LazyPackageFragmentScopeForJavaPackage@307
+    classes('HashMap': Name@305) = LazyJavaClassDescriptor@25['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@306
+    deserializedPackageScope = Empty@293 // through LazyPackageFragmentScopeForJavaPackage@306
+    functions('HashMap': Name@307) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@306
+    memberIndex = computeMemberIndex$1@308 // through LazyPackageFragmentScopeForJavaPackage@306
 }
 
 LazyJavaTypeParameterDescriptor@85['K'] {
-    defaultType = JetTypeImpl@310['K']
+    defaultType = JetTypeImpl@309['K']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-    upperBounds = LinkedHashSet@311[1] { NullableType@312 }
+    upperBounds = LinkedHashSet@310[1] { NullableType@311 }
 }
 
 LazyJavaTypeParameterDescriptor@69['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
 }
 
 LazyJavaTypeParameterDescriptor@86['V'] {
-    defaultType = JetTypeImpl@313['V']
+    defaultType = JetTypeImpl@312['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@212
-    upperBounds = LinkedHashSet@314[1] { NullableType@315 }
+    upperBounds = LinkedHashSet@313[1] { NullableType@314 }
 }
 
 LazyJavaTypeParameterDescriptor@70['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@222
 }
 
-LazyJavaTypeParameterResolver@316 {
-    resolve(JavaTypeParameterImpl@317['K']) = LazyJavaTypeParameterDescriptor@69['K']
-    resolve(JavaTypeParameterImpl@318['V']) = LazyJavaTypeParameterDescriptor@70['V']
+LazyJavaTypeParameterResolver@315 {
+    resolve(JavaTypeParameterImpl@316['K']) = LazyJavaTypeParameterDescriptor@69['K']
+    resolve(JavaTypeParameterImpl@317['V']) = LazyJavaTypeParameterDescriptor@70['V']
 }
 
-LazyJavaTypeParameterResolver@319 {
-    resolve(JavaTypeParameterImpl@320['K']) = LazyJavaTypeParameterDescriptor@85['K']
-    resolve(JavaTypeParameterImpl@321['V']) = LazyJavaTypeParameterDescriptor@86['V']
+LazyJavaTypeParameterResolver@318 {
+    resolve(JavaTypeParameterImpl@319['K']) = LazyJavaTypeParameterDescriptor@85['K']
+    resolve(JavaTypeParameterImpl@320['V']) = LazyJavaTypeParameterDescriptor@86['V']
+}
+
+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]
+    <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@331 {
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@333 }
+    <name not found> = ArrayList@334[1] { ResolutionCandidate@333 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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@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@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[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]
+}
+
+ResolutionTaskHolder@445 {
+    <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/kt619.lazy.log b/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
index 71766580351..965374d0491 100644
--- a/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/kt619.lazy.log
@@ -24,22 +24,36 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Comparable': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Int': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('minus': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('minus': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log b/compiler/testData/diagnostics/tests/inference/listConstructor.lazy.log
index 4635e41001c..0b3b9f4db23 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@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
-LazyJavaClassifierType@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@70['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@72['E'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@74['E']
-    nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+LazyJavaClassifierType@67['E'] {
+    arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@69['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@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@83['E'] {
     arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@74['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
-}
-
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    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@80['E']
+    classifier = JavaTypeParameterImpl@69['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -289,82 +289,213 @@ LazyJavaPackageFragment@135['java'] {
 
 LazyJavaPackageFragment@139['lang'] {
     classes('ArrayList': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('add': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('arrayList': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('cons': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('hasNext': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('iterator': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('next': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('nil': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('size': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('toCollection': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('arrayList': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('cons': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('nil': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('toCollection': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@190
     deserializedPackageScope = Empty@184 // through LazyPackageFragmentScopeForJavaPackage@190
     functions('ArrayList': Name@189) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('add': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('arrayList': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('cons': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('hasNext': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('iterator': Name@195) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('next': Name@196) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('nil': Name@197) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('size': Name@198) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    functions('toCollection': Name@199) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('arrayList': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('cons': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('nil': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('toCollection': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@190
+    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@190
 }
 
 LazyJavaPackageFragment@152['util'] {
-    classes('Any': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('Array': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('ArrayList': Name@204) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('Int': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('List': Name@206) = LazyJavaClassDescriptor@180['List'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('MutableCollection': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('String': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('add': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('arrayList': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('cons': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('hasNext': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('iterator': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('next': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('nil': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('size': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('toCollection': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@184 // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('ArrayList': Name@189) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('add': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('arrayList': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('cons': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('hasNext': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('iterator': Name@195) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('next': Name@196) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('nil': Name@197) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('size': Name@198) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('toCollection': Name@199) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('Any': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('Array': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('ArrayList': Name@199) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('Int': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('List': Name@201) = LazyJavaClassDescriptor@180['List'] // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('MutableCollection': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('String': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('arrayList': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('cons': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('nil': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('toCollection': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    deserializedPackageScope = Empty@184 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('ArrayList': Name@189) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('arrayList': Name@191) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('cons': Name@192) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('nil': Name@193) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('toCollection': Name@194) = EmptyList@186[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    memberIndex = computeMemberIndex$1@204 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
 LazyJavaTypeParameterDescriptor@26['E'] {
-    defaultType = JetTypeImpl@210['E']
+    defaultType = JetTypeImpl@205['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-    upperBounds = LinkedHashSet@211[1] { NullableType@212 }
+    upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
 LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
-LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@74['E']) = LazyJavaTypeParameterDescriptor@21['E']
+LazyJavaTypeParameterResolver@208 {
+    resolve(JavaTypeParameterImpl@209['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
-LazyJavaTypeParameterResolver@214 {
-    resolve(JavaTypeParameterImpl@215['E']) = LazyJavaTypeParameterDescriptor@26['E']
+LazyJavaTypeParameterResolver@210 {
+    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
-LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@217['E']) = LazyJavaTypeParameterDescriptor@17['E']
+LazyJavaTypeParameterResolver@211 {
+    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@17['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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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[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@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@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@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@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 }
+    <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 11923699194..59b0ffe1e89 100644
--- a/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/mapFunction.lazy.log
@@ -57,30 +57,109 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('array': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
     classes('map': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('rangeTo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('times': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
     deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@59
     functions('array': Name@58) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     functions('map': Name@60) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('rangeTo': Name@61) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('times': Name@62) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@30['util'] {
-    classes('Array': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Iterable': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('List': Name@68) = LazyJavaClassDescriptor@49['List'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('array': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('map': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('rangeTo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('times': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('array': Name@58) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('map': Name@60) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('rangeTo': Name@61) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('times': Name@62) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Array': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('Int': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('Iterable': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('List': Name@66) = LazyJavaClassDescriptor@49['List'] // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('String': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('array': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('map': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('array': Name@58) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('map': Name@60) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@63
+}
+
+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@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> = 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[2] { ResolutionCandidate@111, ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[2] { ResolutionCandidate@111, ResolutionCandidate@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]
+}
+
+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 932fc358c9b..d1dba884cd4 100644
--- a/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/mostSpecificAfterInference.lazy.log
@@ -94,3 +94,46 @@ LazyJavaTypeParameterDescriptor@3['T'] {
 LazyJavaTypeParameterResolver@77 {
     resolve(JavaTypeParameterImpl@78['T']) = LazyJavaTypeParameterDescriptor@3['T']
 }
+
+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 }
+}
+
+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]
+    <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 }
+    <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/nestedCalls/arrayAccess.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
index 5f404df80ac..084ddfba410 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/arrayAccess.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
 }
@@ -141,10 +141,58 @@ LazyJavaPackageFragment@62['java'] {
 LazyJavaPackageFragment@64['lang'] {
     classes('Exception': Name@83) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@84
     classes('bar': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('get': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@84
     deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@84
     functions('Exception': Name@83) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     functions('bar': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('get': Name@86) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+}
+
+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@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[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]
+    <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/inference/nestedCalls/binaryExpressions.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
index a570770d395..ccede36f778 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/binaryExpressions.lazy.log
@@ -37,21 +37,21 @@ 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@20['String']
+    classifier = JavaClassImpl@15['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
 }
@@ -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
 }
@@ -153,24 +153,702 @@ LazyJavaPackageFragment@68['java'] {
 LazyJavaPackageFragment@70['lang'] {
     classes('Exception': Name@95) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@96
     classes('compareTo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('contains': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('equals': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('id': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('newA': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('plus': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('toBeOrNot': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('use': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('foo': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('id': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('newA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('plus': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('toBeOrNot': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('use': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@96
     deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@96
     functions('Exception': Name@95) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     functions('compareTo': Name@97) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('contains': Name@98) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('equals': Name@99) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('foo': Name@100) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('id': Name@101) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('newA': Name@102) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('plus': Name@103) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('toBeOrNot': Name@104) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('use': Name@105) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('foo': Name@98) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('id': Name@99) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('newA': Name@100) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('plus': Name@101) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('toBeOrNot': Name@102) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('use': Name@103) = EmptyList@93[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@96
+}
+
+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]
+    <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@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]
+    <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@113 {
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@115 }
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@115 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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@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@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@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@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@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@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[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 }
+}
+
+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 }
+}
+
+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, ... }
+    <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 5a27f0a619c..2cea47d3fae 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/checkTypesForQualifiedProperties.lazy.log
@@ -37,3 +37,41 @@ LazyJavaPackageFragment@15['lang'] {
     functions('foo': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
index e60038cb6bb..207e3256173 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsForArraySetExpression.lazy.log
@@ -30,29 +30,78 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('MutableMap': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('put': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('set': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('put': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('set': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('foo': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('put': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('set': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('put': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('set': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('foo': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('set': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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]
+    <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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
index a9809fa803a..eccbc9d4706 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedCallsInference.lazy.log
@@ -2,59 +2,54 @@ 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['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+LazyJavaClassDescriptor@9['AbstractList'] {
+    defaultType = JetTypeImpl@10['AbstractList<1>']
+    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
-LazyJavaClassDescriptor@21['ArrayList'] {
-    constructors = ArrayList@22[3] { JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'], JavaConstructorDescriptor@25['<init>'] } // through LazyJavaClassMemberScope@26
-    defaultType = JetTypeImpl@27['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@26
+LazyJavaClassDescriptor@19['ArrayList'] {
+    constructors = ArrayList@20[3] { JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
+    defaultType = JetTypeImpl@25['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
     functionTypeForSamInterface = null
-    functions('add': Name@7) = ArrayList@29[2] { JavaMethodDescriptor@30['add'], JavaMethodDescriptor@31['add'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@26
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@26
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['ArrayList']
+    functions('add': Name@27) = ArrayList@28[2] { JavaMethodDescriptor@29['add'], JavaMethodDescriptor@30['add'] } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
+    nestedClasses('add': Name@27) = null // through LazyJavaClassMemberScope@24
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@34['ArrayList']
 }
 
-LazyJavaClassDescriptor@36['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
+LazyJavaClassDescriptor@35['RandomAccess'] {
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
     memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
     typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
 }
 
 LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
     memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
     typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
     supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
+LazyJavaClassTypeConstructor@18['AbstractList'] {
     parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
     supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@35['ArrayList'] {
+LazyJavaClassTypeConstructor@34['ArrayList'] {
     parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
     supertypes = ArrayList@55[5] { LazyJavaClassifierType@56['AbstractList<E>'], LazyJavaClassifierType@57['List<E>'], LazyJavaClassifierType@58['RandomAccess'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@51['AbstractCollection<E>'] {
     arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
     classifier = JavaClassImpl@66['AbstractCollection']
     memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@56['AbstractList<E>'] {
     arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
     classifier = JavaClassImpl@70['AbstractList']
     memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
 LazyJavaClassifierType@72['Cloneable'] {
@@ -131,7 +126,7 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@105['E'] {
@@ -145,14 +140,14 @@ LazyJavaClassifierType@109['E'] {
     arguments = ArrayList@110[empty]
     classifier = JavaTypeParameterImpl@111['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@112['E'] {
     arguments = ArrayList@113[empty]
     classifier = JavaTypeParameterImpl@114['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@115['E'] {
@@ -166,7 +161,7 @@ LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@121['E'] {
@@ -180,14 +175,14 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@130['E'] {
@@ -199,96 +194,96 @@ LazyJavaClassifierType@130['E'] {
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
     classifier = JavaTypeParameterImpl@111['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@52['List<E>'] {
+LazyJavaClassifierType@57['List<E>'] {
     arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
     classifier = JavaClassImpl@159['List']
     memberScope = SubstitutingScope@160
     typeConstructor = DeserializedClassTypeConstructor@161
 }
 
-LazyJavaClassifierType@57['List<E>'] {
+LazyJavaClassifierType@52['List<E>'] {
     arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
     classifier = JavaClassImpl@164['List']
     memberScope = SubstitutingScope@165
@@ -364,9 +359,9 @@ LazyJavaPackageFragmentProvider@178 {
     packageFragments('kotlin.io': FqName@220) = null
     packageFragments('kotlin.jvm': FqName@221) = null
     topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@222['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@36['RandomAccess']
+    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
+    topLevelClasses(JavaClassImpl@222['ArrayList']) = LazyJavaClassDescriptor@19['ArrayList']
+    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
     topLevelClasses(JavaClassImpl@177['Serializable']) = LazyJavaClassDescriptor@40['Serializable']
 }
 
@@ -374,86 +369,168 @@ LazyJavaPackageFragment@197['java'] {
     classes('lang': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@224
     classes('util': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@224
     deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('lang': Name@227) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('util': Name@228) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@224
+    functions('lang': Name@227) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@224
+    functions('util': Name@228) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@224
     memberIndex = computeMemberIndex$1@229 // through LazyPackageFragmentScopeForJavaPackage@224
 }
 
 LazyJavaPackageFragment@201['lang'] {
     classes('ArrayList': Name@230) = null // through LazyPackageFragmentScopeForJavaPackage@231
     classes('Pair': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('hasNext': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('inc': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('iterator': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@231
-    classes('next': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@231
     deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('ArrayList': Name@230) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('Pair': Name@232) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('hasNext': Name@233) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('inc': Name@234) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('iterator': Name@235) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    functions('next': Name@236) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@231
-    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@231
+    functions('ArrayList': Name@230) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@231
+    functions('Pair': Name@232) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@231
+    memberIndex = computeMemberIndex$1@233 // through LazyPackageFragmentScopeForJavaPackage@231
 }
 
 LazyJavaPackageFragment@210['util'] {
-    classes('ArrayList': Name@238) = LazyJavaClassDescriptor@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@239
-    deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@239
-    functions('ArrayList': Name@240) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@239
-    memberIndex = computeMemberIndex$1@241 // through LazyPackageFragmentScopeForJavaPackage@239
-}
-
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@242['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@243[1] { NullableType@244 }
-    upperBoundsAsType = NullableType@244
-}
-
-LazyJavaTypeParameterDescriptor@49['E'] {
-    defaultType = JetTypeImpl@245['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-    upperBounds = LinkedHashSet@246[1] { NullableType@247 }
-    upperBoundsAsType = NullableType@247
+    classes('ArrayList': Name@234) = LazyJavaClassDescriptor@19['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@235
+    deserializedPackageScope = Empty@226 // through LazyPackageFragmentScopeForJavaPackage@235
+    functions('ArrayList': Name@236) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@235
+    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@235
 }
 
 LazyJavaTypeParameterDescriptor@45['E'] {
-    defaultType = JetTypeImpl@248['E']
+    defaultType = JetTypeImpl@238['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    upperBounds = LinkedHashSet@239[1] { NullableType@240 }
+    upperBoundsAsType = NullableType@240
+}
+
+LazyJavaTypeParameterDescriptor@49['E'] {
+    defaultType = JetTypeImpl@241['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@249[1] { NullableType@250 }
-    upperBoundsAsType = NullableType@250
+    upperBounds = LinkedHashSet@242[1] { NullableType@243 }
+    upperBoundsAsType = NullableType@243
+}
+
+LazyJavaTypeParameterDescriptor@54['E'] {
+    defaultType = JetTypeImpl@244['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    upperBounds = LinkedHashSet@245[1] { NullableType@246 }
+    upperBoundsAsType = NullableType@246
+}
+
+LazyJavaTypeParameterResolver@247 {
+    resolve(JavaTypeParameterImpl@248['E']) = LazyJavaTypeParameterDescriptor@49['E']
+}
+
+LazyJavaTypeParameterResolver@249 {
+    resolve(JavaTypeParameterImpl@250['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@253 {
-    resolve(JavaTypeParameterImpl@254['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@114['E']) = null
+}
+
+LazyJavaTypeParameterResolver@254 {
+    resolve(JavaTypeParameterImpl@132['E']) = null
 }
 
 LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@129['E']) = null
+}
+
+LazyJavaTypeParameterResolver@256 {
+    resolve(JavaTypeParameterImpl@123['E']) = null
 }
 
 LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@117['E']) = null
-}
-
-LazyJavaTypeParameterResolver@258 {
-    resolve(JavaTypeParameterImpl@107['E']) = null
-}
-
-LazyJavaTypeParameterResolver@259 {
-    resolve(JavaTypeParameterImpl@100['E']) = null
-}
-
-LazyJavaTypeParameterResolver@260 {
     resolve(JavaTypeParameterImpl@96['E']) = null
 }
 
-LazyJavaTypeParameterResolver@261 {
-    resolve(JavaTypeParameterImpl@120['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]
+    <name not found> = EmptyList@36[empty]
+    <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@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@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@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@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@294 {
+    <name not found> = ArrayList@295[1] { ResolutionCandidate@296 }
+    <name not found> = ArrayList@297[1] { ResolutionCandidate@296 }
+}
+
+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 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
index b202b9f1216..68647f35305 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/completeNestedForVariableAsFunctionCall.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
 }
@@ -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
 }
@@ -148,15 +148,71 @@ LazyJavaPackageFragment@66['java'] {
 
 LazyJavaPackageFragment@68['lang'] {
     classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('b': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('id': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('plus': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('id': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('Exception': Name@91) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('b': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('id': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('invoke': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('plus': Name@96) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('id': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
+}
+
+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]
+    <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@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[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]
+    <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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
index d359cf9960f..c426e9b5b97 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/inferenceForNestedBinaryCall.lazy.log
@@ -36,3 +36,36 @@ LazyJavaPackageFragment@14['lang'] {
     functions('id': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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]
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3395.lazy.log
index 7234f3336bb..d6970d0bbca 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@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
-LazyJavaClassifierType@71['E'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+LazyJavaClassifierType@72['E'] {
+    arguments = ArrayList@73[empty]
+    classifier = JavaTypeParameterImpl@74['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@75['E'] {
@@ -119,28 +119,28 @@ LazyJavaClassifierType@75['E'] {
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@82['E'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@74['E']
     nullable = 'true': Boolean@61
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
@@ -194,14 +194,14 @@ LazyJavaClassifierType@104['String'] {
 
 LazyJavaClassifierType@107['String'] {
     arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@99['String']
+    classifier = JavaClassImpl@106['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
 
 LazyJavaClassifierType@109['String'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@106['String']
+    classifier = JavaClassImpl@99['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@100
 }
@@ -236,14 +236,14 @@ LazyJavaClassifierType@120['Throwable'] {
 
 LazyJavaClassifierType@123['Throwable'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@119['Throwable']
+    classifier = JavaClassImpl@122['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@125['Throwable'] {
     arguments = ArrayList@126[empty]
-    classifier = JavaClassImpl@122['Throwable']
+    classifier = JavaClassImpl@119['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@116
 }
@@ -338,43 +338,205 @@ LazyJavaPackageFragment@162['lang'] {
     classes('Exception': Name@203) = LazyJavaClassDescriptor@15['Exception'] // through LazyPackageFragmentScopeForJavaPackage@202
     classes('foo': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@202
     classes('mapOf': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('plus': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('println': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('query': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('to': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('println': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('query': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('to': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@202
     deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@202
     functions('ArrayList': Name@201) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
     functions('Exception': Name@203) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
     functions('foo': Name@204) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
     functions('mapOf': Name@205) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('plus': Name@206) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('println': Name@207) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('query': Name@208) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('to': Name@209) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('println': Name@206) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('query': Name@207) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('to': Name@208) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@202
 }
 
 LazyJavaPackageFragment@175['util'] {
-    classes('ArrayList': Name@211) = LazyJavaClassDescriptor@7['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('ArrayList': Name@213) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('ArrayList': Name@210) = LazyJavaClassDescriptor@7['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@211
+    deserializedPackageScope = Empty@196 // through LazyPackageFragmentScopeForJavaPackage@211
+    functions('ArrayList': Name@212) = EmptyList@198[empty] // through LazyPackageFragmentScopeForJavaPackage@211
+    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@211
 }
 
 LazyJavaTypeParameterDescriptor@35['E'] {
-    defaultType = JetTypeImpl@215['E']
+    defaultType = JetTypeImpl@214['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-    upperBounds = LinkedHashSet@216[1] { NullableType@217 }
+    upperBounds = LinkedHashSet@215[1] { NullableType@216 }
 }
 
 LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
-LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@35['E']
+LazyJavaTypeParameterResolver@217 {
+    resolve(JavaTypeParameterImpl@218['E']) = LazyJavaTypeParameterDescriptor@35['E']
 }
 
-LazyJavaTypeParameterResolver@220 {
-    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@30['E']
+LazyJavaTypeParameterResolver@219 {
+    resolve(JavaTypeParameterImpl@70['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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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[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[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> = 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]
+    <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@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]
+    <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, ... }
+    <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 9880ecbe0a7..76c65e424bc 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/kt3461checkTypes.lazy.log
@@ -27,12 +27,79 @@ LazyJavaPackageFragment@10['java'] {
 LazyJavaPackageFragment@12['lang'] {
     classes('F': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('p': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('r': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('r': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
     functions('F': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     functions('foo': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('p': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('r': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('r': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = 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> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
index 2922ded5b52..4f35502edc0 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/makeNullableIfSafeCall.lazy.log
@@ -35,11 +35,395 @@ LazyJavaPackageFragment@15['lang'] {
     classes('bar': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('baz': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('doInt': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
     deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
     functions('bar': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     functions('baz': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     functions('doInt': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('foo': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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]
+    <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@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@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 }
+}
+
+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 }
+}
+
+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[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> = 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 }
+}
+
+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 }
+}
+
+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[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[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[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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log b/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
index 51cd5a35ef4..dc29c5e7c77 100644
--- a/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nestedCalls/nontrivialCallExpression.lazy.log
@@ -45,14 +45,14 @@ LazyJavaClassifierType@25['String'] {
 
 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@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -87,14 +87,14 @@ LazyJavaClassifierType@42['Throwable'] {
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@41['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
 }
@@ -150,16 +150,182 @@ LazyJavaPackageFragment@68['lang'] {
     classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('emptyList': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('get': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('makeNullable': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('plus': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('makeNullable': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('Exception': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     functions('bar': Name@92) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     functions('emptyList': Name@93) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     functions('foo': Name@94) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('get': Name@95) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('makeNullable': Name@96) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('plus': Name@97) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@90
+    functions('makeNullable': Name@95) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
+    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@90
+}
+
+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]
+    <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 }
+    <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[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]
+    <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 }
+    <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@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@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@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> = ArrayList@158[1] { ResolutionCandidate@159 }
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@159 }
+}
+
+ResolutionTaskHolder@161 {
+    <name not found> = ArrayList@162[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
+    <name not found> = ArrayList@165[2] { ResolutionCandidate@163, ResolutionCandidate@164 }
+    <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 }
+    <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]
+    <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/noInformationForParameter.lazy.log b/compiler/testData/diagnostics/tests/inference/noInformationForParameter.lazy.log
index deb145a3319..3b34f558786 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@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@61['E'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+LazyJavaClassifierType@60['E'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
-LazyJavaClassifierType@64['E'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+LazyJavaClassifierType@63['E'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['E'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@59['E']
+    classifier = JavaTypeParameterImpl@55['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@55['E']
+    classifier = JavaTypeParameterImpl@59['E']
     nullable = 'true': Boolean@50
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
 }
 
 LazyJavaClassifierType@73['E'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@63['E']
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@22['List<E>'] {
@@ -241,12 +241,12 @@ LazyJavaPackageFragment@108['util'] {
 
 LazyJavaTypeParameterDescriptor@24['E'] {
     defaultType = JetTypeImpl@145['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
     upperBounds = LinkedHashSet@146[1] { NullableType@147 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterResolver@148 {
@@ -254,5 +254,32 @@ LazyJavaTypeParameterResolver@148 {
 }
 
 LazyJavaTypeParameterResolver@150 {
-    resolve(JavaTypeParameterImpl@55['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@65['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]
+    <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 }
+    <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 92d78cba457..279304e2a9c 100644
--- a/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/nullableUpperBound.lazy.log
@@ -43,3 +43,21 @@ LazyJavaPackageFragment@11['lang'] {
     functions('accept': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
+
+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]
+    <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 40aae752b1d..1fa682cb8d5 100644
--- a/compiler/testData/diagnostics/tests/inference/opposite.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/opposite.lazy.log
@@ -44,3 +44,38 @@ LazyJavaPackageFragment@18['lang'] {
     functions('Relation': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+    <name not found> = EmptyList@34[empty]
+    <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@45 {
+    <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]
+}
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
index fea4923b83c..86a49b063f3 100644
--- a/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/possibleCycleOnConstraints.lazy.log
@@ -52,14 +52,14 @@ LazyJavaClassifierType@34['T'] {
 
 LazyJavaClassifierType@37['T'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaTypeParameterImpl@36['T']
+    classifier = JavaTypeParameterImpl@32['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
 LazyJavaClassifierType@39['T'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaTypeParameterImpl@32['T']
+    classifier = JavaTypeParameterImpl@36['T']
     nullable = 'true': Boolean@25
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
@@ -132,3 +132,96 @@ LazyJavaTypeParameterDescriptor@92['T'] {
 LazyJavaTypeParameterResolver@95 {
     resolve(JavaTypeParameterImpl@96['T']) = LazyJavaTypeParameterDescriptor@92['T']
 }
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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@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 {
+    <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 632a897e875..e475e470d79 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/compareBy.lazy.log
@@ -33,7 +33,7 @@ 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
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,14 +75,14 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['Throwable']
+    classifier = JavaClassImpl@35['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
 }
@@ -160,3 +160,52 @@ LazyJavaPackageFragment@59['lang'] {
     functions('compareBy': Name@82) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@92
 }
+
+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]
+    <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]
+}
+
+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@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@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[5] { ResolutionCandidate@112, ResolutionCandidate@113, ResolutionCandidate@114, ... }
+    <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 544638815ae..f7c6411712f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1029.lazy.log
@@ -32,16 +32,58 @@ LazyJavaPackageFragment@13['java'] {
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('from': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('mod': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('rangeTo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('where': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('from': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('where': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('from': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('mod': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('rangeTo': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('where': Name@38) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('from': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('where': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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 }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
index cbdeb5e9c32..faca7061b69 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1031.lazy.log
@@ -49,25 +49,109 @@ LazyJavaPackageFragment@18['java'] {
 }
 
 LazyJavaPackageFragment@20['lang'] {
-    classes('equals': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('mod': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('rangeTo': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('select': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('toString': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('where': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('select': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('where': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
     deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('equals': Name@48) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('mod': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('rangeTo': Name@51) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('select': Name@52) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('toString': Name@53) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('where': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('select': Name@48) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('where': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
 LazyJavaPackageFragment@28['util'] {
-    classes('ArrayList': Name@56) = LazyJavaClassDescriptor@0['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('ArrayList': Name@58) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('ArrayList': Name@52) = LazyJavaClassDescriptor@0['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('ArrayList': Name@54) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[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[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[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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
index bd90e8e70e2..2bc4f8c3f85 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1127.lazy.log
@@ -37,3 +37,12 @@ LazyJavaPackageFragment@15['lang'] {
     functions('asList': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
index 7b24ee51f47..bfcc6ec6bf3 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1145.lazy.log
@@ -38,12 +38,61 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     classes('fold': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('map': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('toString': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
     functions('fold': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     functions('map': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('toString': Name@41) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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]
+    <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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
index 60cd1d3922a..48bfed3b8e7 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1358.lazy.log
@@ -33,3 +33,50 @@ LazyJavaPackageFragment@11['lang'] {
     functions('sure': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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@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]
+    <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@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 24054151cc4..459e84e7a7a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1410.lazy.log
@@ -40,22 +40,140 @@ LazyJavaPackageFragment@17['java'] {
 }
 
 LazyJavaPackageFragment@19['lang'] {
-    classes('add': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('filter': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('filterToMy': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('hasNext': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('iterator': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('next': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('startsWith': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('filter': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('filterToMy': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('startsWith': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
     deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('add': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('filter': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('filterToMy': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('hasNext': Name@45) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('invoke': Name@46) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('iterator': Name@47) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('next': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('startsWith': Name@49) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('filter': Name@41) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('filterToMy': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('startsWith': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
+}
+
+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]
+    <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 }
+    <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@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@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 }
+}
+
+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 }
+}
+
+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[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> = 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[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[2] { ResolutionCandidate@132, ResolutionCandidate@133 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
index defa0cc0f7a..290c44216d6 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1558.lazy.log
@@ -49,3 +49,218 @@ LazyJavaPackageFragment@19['lang'] {
     functions('toArray': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@42
 }
+
+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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@54 {
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@56 }
+    <name not found> = ArrayList@57[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]
+}
+
+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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <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]
+    <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]
+    <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@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@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[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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
index 3def582a4bb..c20592bc41a 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1718.lazy.log
@@ -108,66 +108,66 @@ LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@73['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
-LazyJavaClassifierType@75['E'] {
-    arguments = ArrayList@76[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+LazyJavaClassifierType@74['E'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
     classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@77['E']
+    classifier = JavaTypeParameterImpl@80['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@73['E']
+    classifier = JavaTypeParameterImpl@69['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@69['E']
+    classifier = JavaTypeParameterImpl@73['E']
     nullable = 'true': Boolean@83
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@83
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
-LazyJavaClassifierType@32['List<E>'] {
+LazyJavaClassifierType@37['List<E>'] {
     arguments = ArrayList@92[1] { TypeProjectionImpl@93 }
     classifier = JavaClassImpl@94['List']
     memberScope = SubstitutingScope@95
     typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@37['List<E>'] {
+LazyJavaClassifierType@32['List<E>'] {
     arguments = ArrayList@97[1] { TypeProjectionImpl@98 }
     classifier = JavaClassImpl@99['List']
     memberScope = SubstitutingScope@100
@@ -271,26 +271,63 @@ LazyJavaPackageFragment@135['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
     upperBounds = LinkedHashSet@168[1] { NullableType@169 }
 }
 
 LazyJavaTypeParameterDescriptor@25['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaTypeParameterDescriptor@29['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterResolver@170 {
-    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@29['E']
+    resolve(JavaTypeParameterImpl@171['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@25['E']
+    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
 LazyJavaTypeParameterResolver@174 {
-    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@175['E']) = LazyJavaTypeParameterDescriptor@25['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]
+    <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@188 {
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@190 }
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@190 }
+}
+
+ResolutionTaskHolder@192 {
+    <name not found> = ArrayList@193[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+    <name not found> = ArrayList@196[2] { ResolutionCandidate@194, ResolutionCandidate@195 }
+    <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 eb9b724f2cc..39c026a9a24 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt1944.lazy.log
@@ -30,12 +30,55 @@ LazyJavaPackageFragment@12['java'] {
 
 LazyJavaPackageFragment@14['lang'] {
     classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('run': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('x': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('run': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('x': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
     deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@31
     functions('f': Name@30) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('run': Name@33) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('run': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+    <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@39 {
+    <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> = 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]
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
index be662080c1b..3f68c5461ea 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2179.lazy.log
@@ -103,7 +103,7 @@ LazyJavaClassifierType@68['E'] {
     arguments = ArrayList@69[empty]
     classifier = JavaTypeParameterImpl@70['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@71['E'] {
@@ -117,56 +117,56 @@ LazyJavaClassifierType@75['E'] {
     arguments = ArrayList@76[empty]
     classifier = JavaTypeParameterImpl@77['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@78['E'] {
     arguments = ArrayList@79[empty]
     classifier = JavaTypeParameterImpl@80['E']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
-    classifier = JavaTypeParameterImpl@66['E']
+    classifier = JavaTypeParameterImpl@70['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@73['E']
     nullable = 'true': Boolean@54
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@77['E']
-    nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
 LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@70['E']
+    classifier = JavaTypeParameterImpl@66['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
 }
 
 LazyJavaClassifierType@91['E'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@62['E']
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'true': Boolean@54
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -282,91 +282,416 @@ LazyJavaPackageFragment@133['java'] {
 
 LazyJavaPackageFragment@137['lang'] {
     classes('ArrayList': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('add': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('arrayList': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('hasNext': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('invoke': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('iterator': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('java': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('map': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('mapTo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('next': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('size': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('toCollection': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@184
-    classes('transform': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('arrayList': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('java': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('map': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('mapTo': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('size': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('toCollection': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@184
+    classes('transform': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@184
     deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@184
     functions('ArrayList': Name@183) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('add': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('arrayList': Name@186) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('hasNext': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('invoke': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('iterator': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('map': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('mapTo': Name@192) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('next': Name@193) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('size': Name@194) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('toCollection': Name@195) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    functions('transform': Name@196) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
-    memberIndex = computeMemberIndex$1@197 // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('arrayList': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('map': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('mapTo': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('size': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('toCollection': Name@190) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
+    functions('transform': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@184
+    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@184
 }
 
 LazyJavaPackageFragment@148['util'] {
-    classes('Array': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('ArrayList': Name@200) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Collection': Name@201) = LazyJavaClassDescriptor@172['Collection'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('Int': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('List': Name@203) = LazyJavaClassDescriptor@174['List'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('MutableCollection': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('add': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('arrayList': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('hasNext': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('invoke': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('iterator': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('java': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('map': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('mapTo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('next': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('size': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('toCollection': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('transform': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('ArrayList': Name@183) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('add': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('arrayList': Name@186) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('hasNext': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('invoke': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('iterator': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('map': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('mapTo': Name@192) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('next': Name@193) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('size': Name@194) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('toCollection': Name@195) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('transform': Name@196) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('Array': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('ArrayList': Name@195) = LazyJavaClassDescriptor@4['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('Collection': Name@196) = LazyJavaClassDescriptor@172['Collection'] // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('Int': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('List': Name@198) = LazyJavaClassDescriptor@174['List'] // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('MutableCollection': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('arrayList': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('java': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('map': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('mapTo': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('size': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('toCollection': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('transform': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@194
+    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('ArrayList': Name@183) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('arrayList': Name@185) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('map': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('mapTo': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('size': Name@189) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('toCollection': Name@190) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    functions('transform': Name@191) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@194
+    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@194
 }
 
 LazyJavaTypeParameterDescriptor@26['E'] {
-    defaultType = JetTypeImpl@206['E']
+    defaultType = JetTypeImpl@201['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    upperBounds = LinkedHashSet@202[1] { NullableType@203 }
+}
+
+LazyJavaTypeParameterDescriptor@17['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-    upperBounds = LinkedHashSet@207[1] { NullableType@208 }
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
-LazyJavaTypeParameterDescriptor@17['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+LazyJavaTypeParameterResolver@204 {
+    resolve(JavaTypeParameterImpl@205['E']) = LazyJavaTypeParameterDescriptor@26['E']
 }
 
-LazyJavaTypeParameterResolver@209 {
-    resolve(JavaTypeParameterImpl@66['E']) = LazyJavaTypeParameterDescriptor@17['E']
+LazyJavaTypeParameterResolver@206 {
+    resolve(JavaTypeParameterImpl@62['E']) = LazyJavaTypeParameterDescriptor@17['E']
 }
 
-LazyJavaTypeParameterResolver@210 {
-    resolve(JavaTypeParameterImpl@211['E']) = LazyJavaTypeParameterDescriptor@26['E']
+LazyJavaTypeParameterResolver@207 {
+    resolve(JavaTypeParameterImpl@73['E']) = LazyJavaTypeParameterDescriptor@21['E']
 }
 
-LazyJavaTypeParameterResolver@212 {
-    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@21['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]
+    <name not found> = EmptyList@180[empty]
+    <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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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@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 }
+}
+
+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[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> = 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]
+    <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]
+}
+
+ResolutionTaskHolder@401 {
+    <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 cc9f05a3500..b5e05b601cc 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2200.lazy.log
@@ -37,3 +37,90 @@ LazyJavaPackageFragment@10['lang'] {
     functions('array': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <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 }
+    <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@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]
+    <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]
+}
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
index 7a8e5438179..3031cc37898 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2283.lazy.log
@@ -45,3 +45,17 @@ LazyJavaPackageFragment@19['lang'] {
     functions('map': Name@37) = EmptyList@35[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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
index 3a81890ec7b..ee2bbc5590d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2286.lazy.log
@@ -42,10 +42,120 @@ LazyJavaPackageFragment@10['java'] {
 
 LazyJavaPackageFragment@12['lang'] {
     classes('coll': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('compareTo': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('find': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('find': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
     deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('compareTo': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('find': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('find': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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 }
+    <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> = 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]
+    <name not found> = EmptyList@40[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@40[empty]
+    <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@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 }
+}
+
+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[7] { ResolutionCandidate@96, ResolutionCandidate@97, ResolutionCandidate@98, ... }
+    <name not found> = ArrayList@99[7] { ResolutionCandidate@96, ResolutionCandidate@97, 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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
index 3fffe6c9cd4..407c7d04018 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2294.lazy.log
@@ -39,3 +39,36 @@ LazyJavaPackageFragment@15['lang'] {
     functions('foo': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
index ce8f8bf5fa1..5d6d448e556 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2320.lazy.log
@@ -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
 }
@@ -149,14 +149,68 @@ LazyJavaPackageFragment@66['java'] {
 LazyJavaPackageFragment@68['lang'] {
     classes('Exception': Name@91) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@92
     classes('f': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('getValue': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('invoke': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    classes('mapValuesOriginal': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('mapValuesOriginal': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
     deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
     functions('Exception': Name@91) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     functions('f': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('getValue': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('invoke': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('mapValuesOriginal': Name@96) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('mapValuesOriginal': Name@94) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@92
+}
+
+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]
+    <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> = ArrayList@103[1] { ResolutionCandidate@102 }
+    <name not found> = EmptyList@89[empty]
+    <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@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[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]
+    <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/regressions/kt2324.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
index 2370be1b0d6..280c50e2099 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2324.lazy.log
@@ -2,59 +2,54 @@ 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['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+LazyJavaClassDescriptor@9['AbstractList'] {
+    defaultType = JetTypeImpl@10['AbstractList<1>']
+    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
-LazyJavaClassDescriptor@21['ArrayList'] {
-    constructors = ArrayList@22[3] { JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'], JavaConstructorDescriptor@25['<init>'] } // through LazyJavaClassMemberScope@26
-    defaultType = JetTypeImpl@27['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@26
+LazyJavaClassDescriptor@19['ArrayList'] {
+    constructors = ArrayList@20[3] { JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
+    defaultType = JetTypeImpl@25['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
     functionTypeForSamInterface = null
-    functions('add': Name@7) = ArrayList@29[2] { JavaMethodDescriptor@30['add'], JavaMethodDescriptor@31['add'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@26
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@26
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['ArrayList']
+    functions('add': Name@27) = ArrayList@28[2] { JavaMethodDescriptor@29['add'], JavaMethodDescriptor@30['add'] } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
+    nestedClasses('add': Name@27) = null // through LazyJavaClassMemberScope@24
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@34['ArrayList']
 }
 
-LazyJavaClassDescriptor@36['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
+LazyJavaClassDescriptor@35['RandomAccess'] {
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@37
     memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@37
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
     typeConstructor = LazyJavaClassTypeConstructor@39['RandomAccess']
 }
 
 LazyJavaClassDescriptor@40['Serializable'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
+    functions('add': Name@11) = EmptyList@36[empty] // through LazyJavaClassMemberScope@41
     memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
     typeConstructor = LazyJavaClassTypeConstructor@43['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@44[1] { LazyJavaTypeParameterDescriptor@45['E'] }
     supertypes = ArrayList@46[1] { LazyJavaClassifierType@47['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
+LazyJavaClassTypeConstructor@18['AbstractList'] {
     parameters = ArrayList@48[1] { LazyJavaTypeParameterDescriptor@49['E'] }
     supertypes = ArrayList@50[2] { LazyJavaClassifierType@51['AbstractCollection<E>'], LazyJavaClassifierType@52['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@35['ArrayList'] {
+LazyJavaClassTypeConstructor@34['ArrayList'] {
     parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
     supertypes = ArrayList@55[5] { LazyJavaClassifierType@56['AbstractList<E>'], LazyJavaClassifierType@57['List<E>'], LazyJavaClassifierType@58['RandomAccess'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@51['AbstractCollection<E>'] {
     arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
     classifier = JavaClassImpl@66['AbstractCollection']
     memberScope = SubstitutingScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@56['AbstractList<E>'] {
     arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
     classifier = JavaClassImpl@70['AbstractList']
     memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
 LazyJavaClassifierType@72['Cloneable'] {
@@ -132,164 +127,164 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-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@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@109['E'] {
     arguments = ArrayList@110[empty]
     classifier = JavaTypeParameterImpl@111['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@112['E'] {
     arguments = ArrayList@113[empty]
     classifier = JavaTypeParameterImpl@114['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@115['E'] {
     arguments = ArrayList@116[empty]
     classifier = JavaTypeParameterImpl@117['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@121['E'] {
     arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@123['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@82
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@135['E'] {
     arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@132['E']
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@139['E'] {
     arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@141['E'] {
     arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@96['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@145['E'] {
     arguments = ArrayList@146[empty]
     classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@108['E']
+    classifier = JavaTypeParameterImpl@107['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@120['E']
+    classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@88
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@111['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@155['E'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@88
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@57['List<E>'] {
+LazyJavaClassifierType@52['List<E>'] {
     arguments = ArrayList@157[1] { TypeProjectionImpl@158 }
     classifier = JavaClassImpl@159['List']
     memberScope = SubstitutingScope@160
     typeConstructor = DeserializedClassTypeConstructor@161
 }
 
-LazyJavaClassifierType@52['List<E>'] {
+LazyJavaClassifierType@57['List<E>'] {
     arguments = ArrayList@162[1] { TypeProjectionImpl@163 }
     classifier = JavaClassImpl@164['List']
     memberScope = SubstitutingScope@165
@@ -386,10 +381,10 @@ LazyJavaPackageFragmentProvider@178 {
     packageFragments('kotlin.io': FqName@241) = null
     packageFragments('kotlin.jvm': FqName@242) = null
     topLevelClasses(JavaClassImpl@66['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@243['ArrayList']) = LazyJavaClassDescriptor@21['ArrayList']
+    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
+    topLevelClasses(JavaClassImpl@243['ArrayList']) = LazyJavaClassDescriptor@19['ArrayList']
     topLevelClasses(JavaClassImpl@244['List']) = LazyJavaClassDescriptor@245['List']
-    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@36['RandomAccess']
+    topLevelClasses(JavaClassImpl@174['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
     topLevelClasses(JavaClassImpl@177['Serializable']) = LazyJavaClassDescriptor@40['Serializable']
 }
 
@@ -397,128 +392,318 @@ LazyJavaPackageFragment@203['java'] {
     classes('lang': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@247
     classes('util': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@247
     deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('lang': Name@250) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@247
-    functions('util': Name@251) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('lang': Name@250) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@247
+    functions('util': Name@251) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@247
     memberIndex = computeMemberIndex$1@252 // through LazyPackageFragmentScopeForJavaPackage@247
 }
 
 LazyJavaPackageFragment@207['lang'] {
     classes('ArrayList': Name@253) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@254
     classes('arrayList': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@254
     classes('assertEquals': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('get': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('hasNext': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('invoke': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('iterator': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('next': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('size': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('someFunction': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('toCollection': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@254
-    classes('transform': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('someFunction': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('toCollection': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@254
+    classes('transform': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@254
     deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('ArrayList': Name@253) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('arrayList': Name@255) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('assertEquals': Name@256) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('get': Name@257) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('hasNext': Name@258) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('invoke': Name@259) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('iterator': Name@260) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('next': Name@261) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('size': Name@262) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('someFunction': Name@263) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('toCollection': Name@264) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    functions('transform': Name@265) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@254
-    memberIndex = computeMemberIndex$1@266 // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('ArrayList': Name@253) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('arrayList': Name@255) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('assertEquals': Name@256) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('someFunction': Name@257) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('toCollection': Name@258) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    functions('transform': Name@259) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@254
+    memberIndex = computeMemberIndex$1@260 // through LazyPackageFragmentScopeForJavaPackage@254
 }
 
 LazyJavaPackageFragment@219['util'] {
-    classes('Any': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('Array': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('ArrayList': Name@270) = LazyJavaClassDescriptor@21['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('Int': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('List': Name@272) = LazyJavaClassDescriptor@245['List'] // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('MutableCollection': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('String': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('arrayList': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('assertEquals': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('get': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('hasNext': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('invoke': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('iterator': Name@260) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('next': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('size': Name@262) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('someFunction': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('toCollection': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    classes('transform': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@268
-    deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('ArrayList': Name@253) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('arrayList': Name@255) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('assertEquals': Name@256) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('get': Name@257) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('hasNext': Name@258) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('invoke': Name@259) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('iterator': Name@260) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('next': Name@261) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('size': Name@262) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('someFunction': Name@263) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('toCollection': Name@264) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    functions('transform': Name@265) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@268
-    memberIndex = computeMemberIndex$1@275 // through LazyPackageFragmentScopeForJavaPackage@268
+    classes('Any': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Array': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('ArrayList': Name@264) = LazyJavaClassDescriptor@19['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Int': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('List': Name@266) = LazyJavaClassDescriptor@245['List'] // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('MutableCollection': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('String': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('arrayList': Name@255) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('assertEquals': Name@256) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('someFunction': Name@257) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('toCollection': Name@258) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('transform': Name@259) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    deserializedPackageScope = Empty@249 // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('ArrayList': Name@253) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('arrayList': Name@255) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('assertEquals': Name@256) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('someFunction': Name@257) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('toCollection': Name@258) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('transform': Name@259) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    memberIndex = computeMemberIndex$1@269 // through LazyPackageFragmentScopeForJavaPackage@262
+}
+
+LazyJavaTypeParameterDescriptor@54['E'] {
+    defaultType = JetTypeImpl@270['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    upperBounds = LinkedHashSet@271[1] { NullableType@272 }
+    upperBoundsAsType = NullableType@272
 }
 
 LazyJavaTypeParameterDescriptor@49['E'] {
+    defaultType = JetTypeImpl@273['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    upperBounds = LinkedHashSet@274[1] { NullableType@275 }
+    upperBoundsAsType = NullableType@275
+}
+
+LazyJavaTypeParameterDescriptor@45['E'] {
     defaultType = JetTypeImpl@276['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
     upperBounds = LinkedHashSet@277[1] { NullableType@278 }
     upperBoundsAsType = NullableType@278
 }
 
-LazyJavaTypeParameterDescriptor@45['E'] {
-    defaultType = JetTypeImpl@279['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-    upperBounds = LinkedHashSet@280[1] { NullableType@281 }
-    upperBoundsAsType = NullableType@281
+LazyJavaTypeParameterResolver@279 {
+    resolve(JavaTypeParameterImpl@280['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
-    defaultType = JetTypeImpl@282['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
-    upperBounds = LinkedHashSet@283[1] { NullableType@284 }
-    upperBoundsAsType = NullableType@284
+LazyJavaTypeParameterResolver@281 {
+    resolve(JavaTypeParameterImpl@282['E']) = LazyJavaTypeParameterDescriptor@49['E']
+}
+
+LazyJavaTypeParameterResolver@283 {
+    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
 
 LazyJavaTypeParameterResolver@285 {
-    resolve(JavaTypeParameterImpl@286['E']) = LazyJavaTypeParameterDescriptor@45['E']
+    resolve(JavaTypeParameterImpl@120['E']) = null
+}
+
+LazyJavaTypeParameterResolver@286 {
+    resolve(JavaTypeParameterImpl@100['E']) = null
 }
 
 LazyJavaTypeParameterResolver@287 {
-    resolve(JavaTypeParameterImpl@288['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@123['E']) = null
+}
+
+LazyJavaTypeParameterResolver@288 {
+    resolve(JavaTypeParameterImpl@107['E']) = null
 }
 
 LazyJavaTypeParameterResolver@289 {
-    resolve(JavaTypeParameterImpl@290['E']) = LazyJavaTypeParameterDescriptor@49['E']
+    resolve(JavaTypeParameterImpl@117['E']) = null
 }
 
-LazyJavaTypeParameterResolver@291 {
-    resolve(JavaTypeParameterImpl@108['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]
 }
 
-LazyJavaTypeParameterResolver@292 {
-    resolve(JavaTypeParameterImpl@132['E']) = null
+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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-LazyJavaTypeParameterResolver@293 {
-    resolve(JavaTypeParameterImpl@129['E']) = null
+ResolutionTaskHolder@298 {
+    <name not found> = ArrayList@299[1] { ResolutionCandidate@300 }
+    <name not found> = ArrayList@301[1] { ResolutionCandidate@300 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
 }
 
-LazyJavaTypeParameterResolver@294 {
-    resolve(JavaTypeParameterImpl@104['E']) = null
+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]
 }
 
-LazyJavaTypeParameterResolver@295 {
-    resolve(JavaTypeParameterImpl@123['E']) = null
+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]
+    <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 }
+    <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@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@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@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@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[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@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@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+}
+
+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@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+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[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 }
+    <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 e85f532aeb7..aa52b93801f 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2407.lazy.log
@@ -117,63 +117,63 @@ LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
     classifier = JavaTypeParameterImpl@83['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
-LazyJavaClassifierType@85['E'] {
-    arguments = ArrayList@86[empty]
-    classifier = JavaTypeParameterImpl@87['E']
+LazyJavaClassifierType@84['E'] {
+    arguments = ArrayList@85[empty]
+    classifier = JavaTypeParameterImpl@86['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
     classifier = JavaTypeParameterImpl@90['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
-LazyJavaClassifierType@91['E'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['E']
+LazyJavaClassifierType@92['E'] {
+    arguments = ArrayList@93[empty]
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'false': Boolean@79
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@95['E'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@83['E']
+    classifier = JavaTypeParameterImpl@86['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
 }
 
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@87['E']
+    classifier = JavaTypeParameterImpl@83['E']
     nullable = 'true': Boolean@97
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@93['E']
+    classifier = JavaTypeParameterImpl@90['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@104['E'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@90['E']
+    classifier = JavaTypeParameterImpl@78['E']
     nullable = 'true': Boolean@97
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@45['List<E>'] {
@@ -329,16 +329,16 @@ LazyJavaPackageFragment@157['util'] {
 }
 
 LazyJavaTypeParameterDescriptor@47['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
     upperBounds = LinkedHashSet@215[1] { NullableType@216 }
 }
 
-LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+LazyJavaTypeParameterDescriptor@42['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
-LazyJavaTypeParameterDescriptor@42['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+LazyJavaTypeParameterDescriptor@38['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@87
 }
 
 LazyJavaTypeParameterResolver@217 {
@@ -352,3 +352,82 @@ LazyJavaTypeParameterResolver@219 {
 LazyJavaTypeParameterResolver@221 {
     resolve(JavaTypeParameterImpl@222['E']) = LazyJavaTypeParameterDescriptor@38['E']
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+}
+
+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[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]
+}
+
+ResolutionTaskHolder@265 {
+    <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/kt2445.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
index d31754d48a8..1c8417a5746 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2445.lazy.log
@@ -33,11 +33,35 @@ LazyJavaPackageFragment@13['java'] {
 
 LazyJavaPackageFragment@15['lang'] {
     classes('callback': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('test': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('test': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
     functions('callback': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('invoke': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('test': Name@36) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('test': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2459.lazy.log
index 7f31283518f..770d28dc6d6 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@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
     upperBounds = LinkedHashSet@118[1] { NullableType@119 }
 }
 
 LazyJavaTypeParameterDescriptor@13['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@39
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
 }
 
 LazyJavaTypeParameterResolver@120 {
@@ -206,5 +206,28 @@ LazyJavaTypeParameterResolver@120 {
 }
 
 LazyJavaTypeParameterResolver@122 {
-    resolve(JavaTypeParameterImpl@37['E']) = LazyJavaTypeParameterDescriptor@13['E']
+    resolve(JavaTypeParameterImpl@42['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]
+    <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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
index 33a5260d7d8..18c5bd78b5c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2484.lazy.log
@@ -38,18 +38,269 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     classes('bar': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('forEach': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('hasNext': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('iterator': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('operation': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('operation': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
     deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
     functions('bar': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('forEach': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('hasNext': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('iterator': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('next': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('operation': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('operation': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+    <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]
+}
+
+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@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@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]
+    <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]
+    <name not found> = EmptyList@33[empty]
+    <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@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@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> = 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 }
+}
+
+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 }
+}
+
+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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2505.lazy.log
index 79f62b405fb..c2d351dcffa 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@21['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@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
 }
@@ -144,9 +144,48 @@ LazyJavaPackageFragment@64['java'] {
 
 LazyJavaPackageFragment@66['lang'] {
     classes('Exception': Name@89) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('parseAs': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@90
     deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@90
     functions('Exception': Name@89) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('parseAs': Name@91) = EmptyList@87[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
+    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@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[2] { ResolutionCandidate@106, ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[2] { ResolutionCandidate@106, 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, ... }
+    <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/inference/regressions/kt2514.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
index 3c537ec3c54..b8427a198ab 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2514.lazy.log
@@ -1,386 +1,480 @@
 LazyJavaClassDescriptor@0['AutoCloseable'] {
     defaultType = JetTypeImpl@1['AutoCloseable']
-    functions('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('clone': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('close': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['close'] } // through LazyJavaClassMemberScope@4
-    functions('equals': Name@9) = ArrayList@10[1] { DeserializedSimpleFunctionDescriptor@11['equals'] } // through LazyJavaClassMemberScope@4
-    functions('finalize': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('getClass': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('hashCode': Name@14) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['hashCode'] } // through LazyJavaClassMemberScope@4
-    functions('invoke': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notify': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('notifyAll': Name@19) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    functions('toString': Name@20) = ArrayList@21[1] { DeserializedSimpleFunctionDescriptor@22['toString'] } // through LazyJavaClassMemberScope@4
-    functions('wait': Name@23) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@4
-    properties('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@26['AutoCloseable']
+    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
+    functions('close': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['close'] } // through LazyJavaClassMemberScope@4
+    functions('equals': Name@8) = ArrayList@9[1] { DeserializedSimpleFunctionDescriptor@10['equals'] } // through LazyJavaClassMemberScope@4
+    functions('finalize': Name@11) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
+    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
+    functions('hashCode': Name@13) = ArrayList@14[1] { DeserializedSimpleFunctionDescriptor@15['hashCode'] } // through LazyJavaClassMemberScope@4
+    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
+    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
+    functions('toString': Name@18) = ArrayList@19[1] { DeserializedSimpleFunctionDescriptor@20['toString'] } // through LazyJavaClassMemberScope@4
+    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@4
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@4
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@24['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@27['Closeable'] {
-    allDescriptors = ArrayList@28[4] { DeserializedSimpleFunctionDescriptor@29['hashCode'], JavaMethodDescriptor@30['close'], DeserializedSimpleFunctionDescriptor@31['toString'], ... } // through LazyJavaClassMemberScope@32
-    annotations = LazyJavaAnnotations@33
-    defaultType = JetTypeImpl@34['Closeable']
-    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@32
-    functionTypeForSamInterface = JetTypeImpl@36['Function0<1>']
-    functions('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('clone': Name@5) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('close': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@30['close'] } // through LazyJavaClassMemberScope@32
-    functions('equals': Name@9) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['equals'] } // through LazyJavaClassMemberScope@32
-    functions('finalize': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('getClass': Name@13) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('hashCode': Name@14) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@29['hashCode'] } // through LazyJavaClassMemberScope@32
-    functions('invoke': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('notify': Name@18) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('notifyAll': Name@19) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    functions('toString': Name@20) = ArrayList@42[1] { DeserializedSimpleFunctionDescriptor@31['toString'] } // through LazyJavaClassMemberScope@32
-    functions('wait': Name@23) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@32
-    nestedClasses('block': Name@2) = null // through LazyJavaClassMemberScope@32
-    properties('block': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@45['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
+LazyJavaClassDescriptor@25['Closeable'] {
+    allDescriptors = ArrayList@26[4] { DeserializedSimpleFunctionDescriptor@27['hashCode'], JavaMethodDescriptor@28['close'], DeserializedSimpleFunctionDescriptor@29['toString'], ... } // through LazyJavaClassMemberScope@30
+    annotations = LazyJavaAnnotations@31
+    defaultType = JetTypeImpl@32['Closeable']
+    enumEntryIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@30
+    functionTypeForSamInterface = JetTypeImpl@34['Function0<1>']
+    functions('clone': Name@2) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
+    functions('close': Name@35) = ArrayList@36[1] { JavaMethodDescriptor@28['close'] } // through LazyJavaClassMemberScope@30
+    functions('equals': Name@8) = ArrayList@37[1] { DeserializedSimpleFunctionDescriptor@38['equals'] } // through LazyJavaClassMemberScope@30
+    functions('finalize': Name@11) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
+    functions('getClass': Name@12) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
+    functions('hashCode': Name@13) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@27['hashCode'] } // through LazyJavaClassMemberScope@30
+    functions('notify': Name@16) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
+    functions('notifyAll': Name@17) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
+    functions('toString': Name@18) = ArrayList@40[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@30
+    functions('wait': Name@21) = EmptyList@3[empty] // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@30
+    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@30
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@43['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@44['Closeable']
 }
 
-LazyJavaClassDescriptor@47['Runnable'] {
-    functionTypeForSamInterface = JetTypeImpl@48['Function0<1>']
-    functions('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    functions('invoke': Name@51) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    functions('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    functions('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@50
-    properties('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    properties('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    properties('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@50
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@55['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassDescriptor@45['Runnable'] {
+    functionTypeForSamInterface = JetTypeImpl@46['Function0<1>']
+    functions('invoke': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@48
+    functions('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@48
+    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@48
+    properties('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@48
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@51['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassDescriptor@57['Thread'] {
-    constructors = ArrayList@58[13] { JavaConstructorDescriptor@59['<init>'], JavaConstructorDescriptor@60['<init>'], SamAdapterConstructorDescriptor@61['<init>'], ... } // through LazyJavaClassMemberScope@62
-    defaultType = JetTypeImpl@63['Thread']
-    enumEntryIndex = LinkedHashMap@64 // through LazyJavaClassMemberScope@62
+LazyJavaClassDescriptor@53['Thread'] {
+    constructors = ArrayList@54[13] { JavaConstructorDescriptor@55['<init>'], JavaConstructorDescriptor@56['<init>'], SamAdapterConstructorDescriptor@57['<init>'], ... } // through LazyJavaClassMemberScope@58
+    defaultType = JetTypeImpl@59['Thread']
+    enumEntryIndex = LinkedHashMap@60 // through LazyJavaClassMemberScope@58
     functionTypeForSamInterface = null
-    functions('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    functions('invoke': Name@51) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    functions('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    functions('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@62
-    nestedClassIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@62
-    nestedClasses('block': Name@49) = null // through LazyJavaClassMemberScope@62
-    nestedClasses('use': Name@53) = null // through LazyJavaClassMemberScope@62
-    properties('block': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    properties('plus': Name@52) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    properties('use': Name@53) = EmptyList@3[empty] // through LazyJavaClassMemberScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@67['Thread']
+    functions('invoke': Name@47) = EmptyList@3[empty] // through LazyJavaClassMemberScope@58
+    functions('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@58
+    memberIndex = computeMemberIndex$1@61 // through LazyJavaClassMemberScope@58
+    nestedClassIndex = LinkedHashMap@62 // through LazyJavaClassMemberScope@58
+    nestedClasses('use': Name@49) = null // through LazyJavaClassMemberScope@58
+    properties('use': Name@49) = EmptyList@3[empty] // through LazyJavaClassMemberScope@58
+    typeConstructor = LazyJavaClassTypeConstructor@63['Thread']
 }
 
-LazyJavaClassTypeConstructor@26['AutoCloseable'] {
-    parameters = ArrayList@68[empty]
-    supertypes = ArrayList@69[1] { JetTypeImpl@70['Any'] }
+LazyJavaClassTypeConstructor@24['AutoCloseable'] {
+    parameters = ArrayList@64[empty]
+    supertypes = ArrayList@65[1] { JetTypeImpl@66['Any'] }
 }
 
-LazyJavaClassTypeConstructor@46['Closeable'] {
-    parameters = ArrayList@71[empty]
-    supertypes = ArrayList@72[1] { LazyJavaClassifierType@73['AutoCloseable'] }
+LazyJavaClassTypeConstructor@44['Closeable'] {
+    parameters = ArrayList@67[empty]
+    supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@56['Runnable'] {
-    parameters = ArrayList@74[empty]
-    supertypes = ArrayList@75[1] { JetTypeImpl@70['Any'] }
+LazyJavaClassTypeConstructor@52['Runnable'] {
+    parameters = ArrayList@70[empty]
+    supertypes = ArrayList@71[1] { JetTypeImpl@66['Any'] }
 }
 
-LazyJavaClassTypeConstructor@67['Thread'] {
-    parameters = ArrayList@76[empty]
-    supertypes = ArrayList@77[1] { LazyJavaClassifierType@78['Runnable'] }
+LazyJavaClassTypeConstructor@63['Thread'] {
+    parameters = ArrayList@72[empty]
+    supertypes = ArrayList@73[1] { LazyJavaClassifierType@74['Runnable'] }
 }
 
-LazyJavaClassifierType@73['AutoCloseable'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['AutoCloseable']
+LazyJavaClassifierType@69['AutoCloseable'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaClassImpl@76['AutoCloseable']
     memberScope = LazyJavaClassMemberScope@4
-    typeConstructor = LazyJavaClassTypeConstructor@26['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@24['AutoCloseable']
 }
 
-LazyJavaClassifierType@81['Object'] {
-    classifier = JavaClassImpl@82['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
+LazyJavaClassifierType@77['Object'] {
+    classifier = JavaClassImpl@78['Object']
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
-LazyJavaClassifierType@84['Object'] {
-    classifier = JavaClassImpl@85['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
+LazyJavaClassifierType@80['Object'] {
+    classifier = JavaClassImpl@81['Object']
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
-LazyJavaClassifierType@86['Object'] {
-    classifier = JavaClassImpl@87['Object']
-    typeConstructor = DeserializedClassTypeConstructor@83
+LazyJavaClassifierType@82['Object'] {
+    classifier = JavaClassImpl@83['Object']
+    typeConstructor = DeserializedClassTypeConstructor@79
 }
 
-LazyJavaClassifierType@78['Runnable'] {
-    arguments = ArrayList@88[empty]
-    classifier = JavaClassImpl@89['Runnable']
-    memberScope = LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@74['Runnable'] {
+    arguments = ArrayList@84[empty]
+    classifier = JavaClassImpl@85['Runnable']
+    memberScope = LazyJavaClassMemberScope@48
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
+}
+
+LazyJavaClassifierType@86['Runnable'] {
+    arguments = ArrayList@87[empty]
+    classifier = JavaClassImpl@88['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
 LazyJavaClassifierType@90['Runnable'] {
     arguments = ArrayList@91[empty]
     classifier = JavaClassImpl@92['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@94['Runnable'] {
-    arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@96['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@93['Runnable'] {
+    arguments = ArrayList@94[empty]
+    classifier = JavaClassImpl@95['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@97['Runnable'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaClassImpl@99['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@96['Runnable'] {
+    arguments = ArrayList@97[empty]
+    classifier = JavaClassImpl@98['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@100['Runnable'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@102['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@99['Runnable'] {
+    arguments = ArrayList@100[empty]
+    classifier = JavaClassImpl@101['Runnable']
+    nullable = 'false': Boolean@89
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@103['Runnable'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaClassImpl@105['Runnable']
-    nullable = 'false': Boolean@93
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@102['Runnable'] {
+    arguments = ArrayList@103[empty]
+    classifier = JavaClassImpl@101['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@106['Runnable'] {
-    arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@96['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+LazyJavaClassifierType@105['Runnable'] {
+    arguments = ArrayList@106[empty]
+    classifier = JavaClassImpl@92['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
+}
+
+LazyJavaClassifierType@107['Runnable'] {
+    arguments = ArrayList@108[empty]
+    classifier = JavaClassImpl@95['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
 LazyJavaClassifierType@109['Runnable'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaClassImpl@105['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    classifier = JavaClassImpl@88['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
 LazyJavaClassifierType@111['Runnable'] {
     arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@92['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    classifier = JavaClassImpl@98['Runnable']
+    nullable = 'true': Boolean@104
+    typeConstructor = LazyJavaClassTypeConstructor@52['Runnable']
 }
 
-LazyJavaClassifierType@113['Runnable'] {
+LazyJavaClassifierType@113['String'] {
     arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@102['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
-}
-
-LazyJavaClassifierType@115['Runnable'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@99['Runnable']
-    nullable = 'true': Boolean@108
-    typeConstructor = LazyJavaClassTypeConstructor@56['Runnable']
+    classifier = JavaClassImpl@115['String']
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@117['String'] {
     arguments = ArrayList@118[empty]
     classifier = JavaClassImpl@119['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@121['String'] {
-    arguments = ArrayList@122[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@120['String'] {
+    arguments = ArrayList@121[empty]
+    classifier = JavaClassImpl@122['String']
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@124['String'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@126['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@123['String'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaClassImpl@125['String']
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@127['String'] {
-    arguments = ArrayList@128[empty]
-    classifier = JavaClassImpl@129['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@126['String'] {
+    arguments = ArrayList@127[empty]
+    classifier = JavaClassImpl@128['String']
+    nullable = 'false': Boolean@89
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@130['String'] {
-    arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@132['String']
-    nullable = 'false': Boolean@93
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@129['String'] {
+    arguments = ArrayList@130[empty]
+    classifier = JavaClassImpl@122['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
+}
+
+LazyJavaClassifierType@131['String'] {
+    arguments = ArrayList@132[empty]
+    classifier = JavaClassImpl@128['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@133['String'] {
     arguments = ArrayList@134[empty]
-    classifier = JavaClassImpl@129['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+    classifier = JavaClassImpl@115['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@135['String'] {
     arguments = ArrayList@136[empty]
     classifier = JavaClassImpl@119['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
 LazyJavaClassifierType@137['String'] {
     arguments = ArrayList@138[empty]
-    classifier = JavaClassImpl@126['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+    classifier = JavaClassImpl@125['String']
+    nullable = 'true': Boolean@104
+    typeConstructor = DeserializedClassTypeConstructor@116
 }
 
-LazyJavaClassifierType@139['String'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaClassImpl@132['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@139['ThreadGroup'] {
+    classifier = null
+    nullable = 'false': Boolean@89
+    typeConstructor = TypeConstructorImpl$1@140
 }
 
-LazyJavaClassifierType@141['String'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaClassImpl@123['String']
-    nullable = 'true': Boolean@108
-    typeConstructor = DeserializedClassTypeConstructor@120
+LazyJavaClassifierType@141['ThreadGroup'] {
+    classifier = null
+    nullable = 'false': Boolean@89
+    typeConstructor = TypeConstructorImpl$1@142
 }
 
 LazyJavaClassifierType@143['ThreadGroup'] {
     classifier = null
-    nullable = 'false': Boolean@93
+    nullable = 'false': Boolean@89
     typeConstructor = TypeConstructorImpl$1@144
 }
 
 LazyJavaClassifierType@145['ThreadGroup'] {
     classifier = null
-    nullable = 'false': Boolean@93
+    nullable = 'false': Boolean@89
     typeConstructor = TypeConstructorImpl$1@146
 }
 
 LazyJavaClassifierType@147['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@93
-    typeConstructor = TypeConstructorImpl$1@148
+    nullable = 'true': Boolean@104
+}
+
+LazyJavaClassifierType@148['ThreadGroup'] {
+    nullable = 'true': Boolean@104
 }
 
 LazyJavaClassifierType@149['ThreadGroup'] {
-    classifier = null
-    nullable = 'false': Boolean@93
-    typeConstructor = TypeConstructorImpl$1@150
+    nullable = 'true': Boolean@104
 }
 
-LazyJavaClassifierType@151['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+LazyJavaClassifierType@150['ThreadGroup'] {
+    nullable = 'true': Boolean@104
 }
 
-LazyJavaClassifierType@152['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+LazyJavaPackageFragmentProvider@151 {
+    packageFragments('<root>': FqName@152) = LazyJavaPackageFragment@153['<root>']
+    packageFragments('Array': FqName@154) = null
+    packageFragments('Closeable': FqName@155) = null
+    packageFragments('Int': FqName@156) = null
+    packageFragments('R': FqName@157) = null
+    packageFragments('String': FqName@158) = null
+    packageFragments('T': FqName@159) = null
+    packageFragments('Thread': FqName@160) = null
+    packageFragments('Unit': FqName@161) = null
+    packageFragments('java': FqName@162) = LazyJavaPackageFragment@163['java']
+    packageFragments('java.io': FqName@164) = LazyJavaPackageFragment@165['io']
+    packageFragments('java.io.Closeable': FqName@166) = null
+    packageFragments('java.lang': FqName@167) = LazyJavaPackageFragment@168['lang']
+    packageFragments('java.lang.Array': FqName@169) = null
+    packageFragments('java.lang.Closeable': FqName@170) = null
+    packageFragments('java.lang.Int': FqName@171) = null
+    packageFragments('java.lang.R': FqName@172) = null
+    packageFragments('java.lang.String': FqName@173) = null
+    packageFragments('java.lang.T': FqName@174) = null
+    packageFragments('java.lang.Thread': FqName@175) = null
+    packageFragments('java.lang.Unit': FqName@176) = null
+    packageFragments('kotlin': FqName@177) = null
+    packageFragments('kotlin.Array': FqName@178) = null
+    packageFragments('kotlin.Closeable': FqName@179) = null
+    packageFragments('kotlin.Int': FqName@180) = null
+    packageFragments('kotlin.R': FqName@181) = null
+    packageFragments('kotlin.String': FqName@182) = null
+    packageFragments('kotlin.T': FqName@183) = null
+    packageFragments('kotlin.Thread': FqName@184) = null
+    packageFragments('kotlin.Unit': FqName@185) = null
+    packageFragments('kotlin.io': FqName@186) = null
+    packageFragments('kotlin.jvm': FqName@187) = null
+    packageFragments('kt2514': FqName@188) = null
+    packageFragments('kt2514.Array': FqName@189) = null
+    packageFragments('kt2514.Closeable': FqName@190) = null
+    packageFragments('kt2514.Int': FqName@191) = null
+    packageFragments('kt2514.R': FqName@192) = null
+    packageFragments('kt2514.String': FqName@193) = null
+    packageFragments('kt2514.T': FqName@194) = null
+    packageFragments('kt2514.Thread': FqName@195) = null
+    packageFragments('kt2514.Unit': FqName@196) = null
+    topLevelClasses(JavaClassImpl@76['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
+    topLevelClasses(JavaClassImpl@197['Closeable']) = LazyJavaClassDescriptor@25['Closeable']
+    topLevelClasses(JavaClassImpl@85['Runnable']) = LazyJavaClassDescriptor@45['Runnable']
+    topLevelClasses(JavaClassImpl@198['Thread']) = LazyJavaClassDescriptor@53['Thread']
 }
 
-LazyJavaClassifierType@153['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+LazyJavaPackageFragment@165['io'] {
+    classes('Closeable': Name@199) = LazyJavaClassDescriptor@25['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@200
+    deserializedPackageScope = Empty@201 // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('Closeable': Name@202) = ArrayList@203[1] { SamConstructorDescriptor@204['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@200
+    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@200
 }
 
-LazyJavaClassifierType@154['ThreadGroup'] {
-    nullable = 'true': Boolean@108
+LazyJavaPackageFragment@163['java'] {
+    classes('io': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@207
+    classes('lang': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@207
+    deserializedPackageScope = Empty@201 // through LazyPackageFragmentScopeForJavaPackage@207
+    functions('io': Name@209) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@207
+    functions('lang': Name@210) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@207
+    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@207
 }
 
-LazyJavaPackageFragmentProvider@155 {
-    packageFragments('<root>': FqName@156) = LazyJavaPackageFragment@157['<root>']
-    packageFragments('Array': FqName@158) = null
-    packageFragments('Closeable': FqName@159) = null
-    packageFragments('Int': FqName@160) = null
-    packageFragments('R': FqName@161) = null
-    packageFragments('String': FqName@162) = null
-    packageFragments('T': FqName@163) = null
-    packageFragments('Thread': FqName@164) = null
-    packageFragments('Unit': FqName@165) = null
-    packageFragments('java': FqName@166) = LazyJavaPackageFragment@167['java']
-    packageFragments('java.io': FqName@168) = LazyJavaPackageFragment@169['io']
-    packageFragments('java.io.Closeable': FqName@170) = null
-    packageFragments('java.lang': FqName@171) = LazyJavaPackageFragment@172['lang']
-    packageFragments('java.lang.Array': FqName@173) = null
-    packageFragments('java.lang.Closeable': FqName@174) = null
-    packageFragments('java.lang.Int': FqName@175) = null
-    packageFragments('java.lang.R': FqName@176) = null
-    packageFragments('java.lang.String': FqName@177) = null
-    packageFragments('java.lang.T': FqName@178) = null
-    packageFragments('java.lang.Thread': FqName@179) = null
-    packageFragments('java.lang.Unit': FqName@180) = null
-    packageFragments('kotlin': FqName@181) = null
-    packageFragments('kotlin.Array': FqName@182) = null
-    packageFragments('kotlin.Closeable': FqName@183) = null
-    packageFragments('kotlin.Int': FqName@184) = null
-    packageFragments('kotlin.R': FqName@185) = null
-    packageFragments('kotlin.String': FqName@186) = null
-    packageFragments('kotlin.T': FqName@187) = null
-    packageFragments('kotlin.Thread': FqName@188) = null
-    packageFragments('kotlin.Unit': FqName@189) = null
-    packageFragments('kotlin.io': FqName@190) = null
-    packageFragments('kotlin.jvm': FqName@191) = null
-    packageFragments('kt2514': FqName@192) = null
-    packageFragments('kt2514.Array': FqName@193) = null
-    packageFragments('kt2514.Closeable': FqName@194) = null
-    packageFragments('kt2514.Int': FqName@195) = null
-    packageFragments('kt2514.R': FqName@196) = null
-    packageFragments('kt2514.String': FqName@197) = null
-    packageFragments('kt2514.T': FqName@198) = null
-    packageFragments('kt2514.Thread': FqName@199) = null
-    packageFragments('kt2514.Unit': FqName@200) = null
-    topLevelClasses(JavaClassImpl@80['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@201['Closeable']) = LazyJavaClassDescriptor@27['Closeable']
-    topLevelClasses(JavaClassImpl@89['Runnable']) = LazyJavaClassDescriptor@47['Runnable']
-    topLevelClasses(JavaClassImpl@202['Thread']) = LazyJavaClassDescriptor@57['Thread']
+LazyJavaPackageFragment@168['lang'] {
+    classes('Thread': Name@212) = LazyJavaClassDescriptor@53['Thread'] // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('block': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('invoke': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('use': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    deserializedPackageScope = Empty@201 // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('Thread': Name@215) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('block': Name@214) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('invoke': Name@47) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('use': Name@49) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@213
+    memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@213
 }
 
-LazyJavaPackageFragment@169['io'] {
-    classes('Closeable': Name@203) = LazyJavaClassDescriptor@27['Closeable'] // through LazyPackageFragmentScopeForJavaPackage@204
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('Closeable': Name@206) = ArrayList@207[1] { SamConstructorDescriptor@208['Closeable'] } // through LazyPackageFragmentScopeForJavaPackage@204
-    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@204
+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> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
 }
 
-LazyJavaPackageFragment@167['java'] {
-    classes('io': Name@210) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    classes('lang': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@211
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('io': Name@213) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    functions('lang': Name@214) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@211
-    memberIndex = computeMemberIndex$1@215 // through LazyPackageFragmentScopeForJavaPackage@211
+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]
+    <name not found> = EmptyList@3[empty]
+    <name not found> = EmptyList@3[empty]
 }
 
-LazyJavaPackageFragment@172['lang'] {
-    classes('Thread': Name@216) = LazyJavaClassDescriptor@57['Thread'] // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('block': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('invoke': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('plus': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    classes('use': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@217
-    deserializedPackageScope = Empty@205 // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('Thread': Name@218) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('block': Name@49) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('invoke': Name@51) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('plus': Name@52) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    functions('use': Name@53) = EmptyList@3[empty] // through LazyPackageFragmentScopeForJavaPackage@217
-    memberIndex = computeMemberIndex$1@219 // through LazyPackageFragmentScopeForJavaPackage@217
+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> = 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]
+    <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 }
+    <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@252 {
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@254 }
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@254 }
+    <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 }
+    <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]
+    <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@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@279 {
+    <name not found> = ArrayList@280[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
+    <name not found> = ArrayList@283[2] { ResolutionCandidate@281, ResolutionCandidate@282 }
+    <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 4246262a86b..115da9b9586 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2741.lazy.log
@@ -33,21 +33,21 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['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@18['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@18['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@38['Throwable']
+    classifier = JavaClassImpl@35['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@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -161,3 +161,96 @@ LazyJavaPackageFragment@68['lang'] {
     functions('xxx': Name@100) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
     memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@95
 }
+
+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]
+    <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]
+    <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, ... }
+    <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@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]
+    <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@127 {
+    <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 0e6174b8620..2a16aef5d9c 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2838.lazy.log
@@ -38,7 +38,7 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -52,7 +52,7 @@ LazyJavaClassifierType@28['String'] {
 
 LazyJavaClassifierType@30['String'] {
     arguments = ArrayList@31[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@16['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
 }
@@ -143,11 +143,113 @@ LazyJavaPackageFragment@65['lang'] {
     classes('Exception': Name@84) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
     classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('foo': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('get': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('Exception': Name@84) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('bar': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('foo': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('get': Name@88) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@85
+}
+
+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]
+    <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 }
+    <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@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@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[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[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]
+    <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, ... }
+    <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 49c890395b2..5884df874a6 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841.lazy.log
@@ -53,14 +53,83 @@ LazyJavaPackageFragment@23['java'] {
 LazyJavaPackageFragment@25['lang'] {
     classes('C': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('block': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('invoke': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('use1': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('x': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('use1': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('x': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
     deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
     functions('C': Name@50) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     functions('block': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('invoke': Name@53) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('use1': Name@54) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('x': Name@56) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('use1': Name@53) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('x': Name@55) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@51
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@48[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> = 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@78 {
+    <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/kt2841_it.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
index 7fc9808521b..1ccce7fc2e1 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_it.lazy.log
@@ -45,16 +45,93 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
     classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('close': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('x': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('use': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('x': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
     deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
     functions('C': Name@42) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     functions('block': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('close': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('x': Name@49) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('use': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('x': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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]
+}
+
+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 }
+}
+
+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]
+}
+
+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]
 }
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 dd0967e175f..cfa16c9b7b9 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
@@ -45,16 +45,187 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
     classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('close': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('xx': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('use': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('xx': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
     deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
     functions('C': Name@42) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     functions('block': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('close': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('xx': Name@49) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('invoke': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('use': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('xx': Name@48) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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@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]
+    <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 }
+    <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]
+    <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@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 }
+}
+
+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 }
+}
+
+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]
+    <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]
+    <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@95 {
+    <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]
 }
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 7fc9808521b..004ed87a3ba 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2841_this.lazy.log
@@ -45,16 +45,169 @@ LazyJavaPackageFragment@19['java'] {
 LazyJavaPackageFragment@21['lang'] {
     classes('C': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
     classes('block': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('close': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('use': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('x': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('use': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@43
     deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
     functions('C': Name@42) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     functions('block': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('close': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('use': Name@47) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('x': Name@49) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('invoke': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('use': Name@46) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('x': Name@48) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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@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]
+    <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@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> = 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]
+    <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@82 {
+    <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]
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
index 6dd267dc951..928937c9d7d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2842.lazy.log
@@ -71,3 +71,78 @@ LazyJavaPackageFragment@29['lang'] {
     functions('iterator': Name@65) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@62
 }
+
+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]
+    <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@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]
+    <name not found> = EmptyList@59[empty]
+}
+
+ResolutionTaskHolder@75 {
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
+    <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@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@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/inference/regressions/kt2883.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
index 79e7d370f81..ee538f62ff6 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt2883.lazy.log
@@ -45,13 +45,109 @@ LazyJavaPackageFragment@19['java'] {
 
 LazyJavaPackageFragment@21['lang'] {
     classes('Y': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('add': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('bar': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('doAction': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('bar': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('doAction': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@46
     deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
     functions('Y': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('add': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('bar': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('doAction': Name@49) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('bar': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('doAction': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+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]
+    <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]
+    <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@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 }
+}
+
+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 }
+}
+
+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]
+    <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]
+    <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 }
+    <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 250d285f269..51286a2fb2b 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3007.lazy.log
@@ -36,12 +36,405 @@ LazyJavaPackageFragment@15['java'] {
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('equals': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('fold': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('tempFun': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('fold': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('tempFun': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('fold': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('tempFun': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('fold': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('tempFun': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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]
+    <name not found> = EmptyList@35[empty]
+    <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]
+    <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> = ArrayList@52[1] { ResolutionCandidate@51 }
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@63 }
+    <name not found> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <name not found> = EmptyList@35[empty]
+    <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]
+    <name not found> = EmptyList@35[empty]
+}
+
+ResolutionTaskHolder@73 {
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@75 }
+    <name not found> = ArrayList@76[1] { ResolutionCandidate@75 }
+    <name not found> = EmptyList@35[empty]
+    <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@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@89 {
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@91 }
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@91 }
+    <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@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[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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@119 {
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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 c726ee95b83..ea84f4b3f9d 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3038.lazy.log
@@ -39,3 +39,140 @@ LazyJavaPackageFragment@15['lang'] {
     functions('use': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <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]
+    <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[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]
+    <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@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@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> = 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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+}
+
+ResolutionTaskHolder@89 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 63c3abd2be9..956d4fd0311 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3150.lazy.log
@@ -160,3 +160,87 @@ LazyJavaTypeParameterDescriptor@19['T'] {
 LazyJavaTypeParameterResolver@98 {
     resolve(JavaTypeParameterImpl@99['T']) = LazyJavaTypeParameterDescriptor@19['T']
 }
+
+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> = EmptyList@87[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> = 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 }
+    <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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
index b2fece38c62..81f45986576 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3174.lazy.log
@@ -37,12 +37,53 @@ LazyJavaPackageFragment@16['java'] {
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('add': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('fff': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('test': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('fff': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('test': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('add': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('fff': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('test': Name@39) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('fff': Name@36) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('test': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+    <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@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 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[2] { ResolutionCandidate@66, ResolutionCandidate@67 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
index 155ae84487b..8da374cda12 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3301.lazy.log
@@ -41,3 +41,49 @@ LazyJavaPackageFragment@17['lang'] {
     functions('m': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@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@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]
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
index efa4a10e7e1..39c15aa8222 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt3344.lazy.log
@@ -6,80 +6,75 @@ LazyJavaClassDescriptor@2['AbstractCollection'] {
     defaultType = JetTypeImpl@3['AbstractCollection<1>']
     functions('add': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['add'] } // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@13['AbstractList'] {
-    defaultType = JetTypeImpl@14['AbstractList<1>']
-    functions('add': Name@15) = ArrayList@16[2] { JavaMethodDescriptor@17['add'], JavaMethodDescriptor@18['add'] } // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+LazyJavaClassDescriptor@11['AbstractList'] {
+    defaultType = JetTypeImpl@12['AbstractList<1>']
+    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
 }
 
-LazyJavaClassDescriptor@23['AbstractMap'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['AbstractMap']
+LazyJavaClassDescriptor@21['AbstractMap'] {
+    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractMap']
 }
 
-LazyJavaClassDescriptor@25['ArrayList'] {
-    constructors = ArrayList@26[3] { JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'] } // through LazyJavaClassMemberScope@30
-    defaultType = JetTypeImpl@31['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@30
+LazyJavaClassDescriptor@23['ArrayList'] {
+    constructors = ArrayList@24[3] { JavaConstructorDescriptor@25['<init>'], JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'] } // through LazyJavaClassMemberScope@28
+    defaultType = JetTypeImpl@29['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@28
     functionTypeForSamInterface = null
-    functions('add': Name@9) = ArrayList@33[2] { JavaMethodDescriptor@34['add'], JavaMethodDescriptor@35['add'] } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@30
-    nestedClasses('add': Name@9) = null // through LazyJavaClassMemberScope@30
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@30
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['ArrayList']
+    functions('add': Name@31) = ArrayList@32[2] { JavaMethodDescriptor@33['add'], JavaMethodDescriptor@34['add'] } // through LazyJavaClassMemberScope@28
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@28
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@28
+    nestedClasses('add': Name@31) = null // through LazyJavaClassMemberScope@28
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@38['ArrayList']
 }
 
-LazyJavaClassDescriptor@40['HashMap'] {
-    constructors = ArrayList@41[4] { JavaConstructorDescriptor@42['<init>'], JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], ... } // through LazyJavaClassMemberScope@45
-    defaultType = JetTypeImpl@46['HashMap<2>']
+LazyJavaClassDescriptor@39['HashMap'] {
+    constructors = ArrayList@40[4] { JavaConstructorDescriptor@41['<init>'], JavaConstructorDescriptor@42['<init>'], JavaConstructorDescriptor@43['<init>'], ... } // through LazyJavaClassMemberScope@44
+    defaultType = JetTypeImpl@45['HashMap<2>']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@47['HashMap']
+    typeConstructor = LazyJavaClassTypeConstructor@46['HashMap']
 }
 
-LazyJavaClassDescriptor@48['RandomAccess'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@49
+LazyJavaClassDescriptor@47['RandomAccess'] {
+    functions('add': Name@13) = EmptyList@48[empty] // through LazyJavaClassMemberScope@49
     memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@49
     typeConstructor = LazyJavaClassTypeConstructor@51['RandomAccess']
 }
 
 LazyJavaClassDescriptor@52['Serializable'] {
-    functions('add': Name@15) = EmptyList@10[empty] // through LazyJavaClassMemberScope@53
+    functions('add': Name@13) = EmptyList@48[empty] // through LazyJavaClassMemberScope@53
     memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    properties('add': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@53
     typeConstructor = LazyJavaClassTypeConstructor@55['Serializable']
 }
 
-LazyJavaClassTypeConstructor@12['AbstractCollection'] {
+LazyJavaClassTypeConstructor@10['AbstractCollection'] {
     parameters = ArrayList@56[1] { LazyJavaTypeParameterDescriptor@57['E'] }
     supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@22['AbstractList'] {
+LazyJavaClassTypeConstructor@20['AbstractList'] {
     parameters = ArrayList@60[1] { LazyJavaTypeParameterDescriptor@61['E'] }
     supertypes = ArrayList@62[2] { LazyJavaClassifierType@63['AbstractCollection<E>'], LazyJavaClassifierType@64['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@24['AbstractMap'] {
+LazyJavaClassTypeConstructor@22['AbstractMap'] {
     parameters = ArrayList@65[2] { LazyJavaTypeParameterDescriptor@66['K'], LazyJavaTypeParameterDescriptor@67['V'] }
     supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@39['ArrayList'] {
+LazyJavaClassTypeConstructor@38['ArrayList'] {
     parameters = ArrayList@70[1] { LazyJavaTypeParameterDescriptor@71['E'] }
     supertypes = ArrayList@72[5] { LazyJavaClassifierType@73['AbstractList<E>'], LazyJavaClassifierType@74['List<E>'], LazyJavaClassifierType@75['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@47['HashMap'] {
+LazyJavaClassTypeConstructor@46['HashMap'] {
     parameters = ArrayList@76[2] { LazyJavaTypeParameterDescriptor@77['K'], LazyJavaTypeParameterDescriptor@78['V'] }
     supertypes = ArrayList@79[4] { LazyJavaClassifierType@80['AbstractMap<K, V>'], LazyJavaClassifierType@81['Map<K, V>'], LazyJavaClassifierType@82['Cloneable'], ... }
 }
@@ -98,20 +93,20 @@ LazyJavaClassifierType@63['AbstractCollection<E>'] {
     arguments = ArrayList@88[1] { TypeProjectionImpl@89 }
     classifier = JavaClassImpl@90['AbstractCollection']
     memberScope = SubstitutingScope@91
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
 LazyJavaClassifierType@73['AbstractList<E>'] {
     arguments = ArrayList@92[1] { TypeProjectionImpl@93 }
     classifier = JavaClassImpl@94['AbstractList']
     memberScope = SubstitutingScope@95
-    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
 }
 
 LazyJavaClassifierType@80['AbstractMap<K, V>'] {
     arguments = ArrayList@96[2] { TypeProjectionImpl@97, TypeProjectionImpl@98 }
     classifier = JavaClassImpl@99['AbstractMap']
-    typeConstructor = LazyJavaClassTypeConstructor@24['AbstractMap']
+    typeConstructor = LazyJavaClassTypeConstructor@22['AbstractMap']
 }
 
 LazyJavaClassifierType@100['Cloneable'] {
@@ -167,21 +162,21 @@ LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@134['E'] {
     arguments = ArrayList@135[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@137['E'] {
     arguments = ArrayList@138[empty]
     classifier = JavaTypeParameterImpl@139['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@140['E'] {
@@ -195,14 +190,14 @@ LazyJavaClassifierType@144['E'] {
     arguments = ArrayList@145[empty]
     classifier = JavaTypeParameterImpl@146['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@147['E'] {
     arguments = ArrayList@148[empty]
     classifier = JavaTypeParameterImpl@149['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
 }
 
 LazyJavaClassifierType@150['E'] {
@@ -223,75 +218,75 @@ LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
     classifier = JavaTypeParameterImpl@158['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@159['E'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['E']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@149['E']
+    classifier = JavaTypeParameterImpl@142['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
 }
 
 LazyJavaClassifierType@164['E'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@146['E']
+    classifier = JavaTypeParameterImpl@152['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@166['E'] {
     arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@158['E']
+    classifier = JavaTypeParameterImpl@139['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@168['E'] {
     arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@129['E']
+    classifier = JavaTypeParameterImpl@158['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@170['E'] {
     arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@155['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@172['E'] {
     arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+    classifier = JavaTypeParameterImpl@146['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@174['E'] {
     arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@161['E']
+    classifier = JavaTypeParameterImpl@133['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@176['E'] {
     arguments = ArrayList@177[empty]
-    classifier = JavaTypeParameterImpl@152['E']
+    classifier = JavaTypeParameterImpl@155['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@178['E'] {
     arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+    classifier = JavaTypeParameterImpl@161['E']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
@@ -300,21 +295,21 @@ LazyJavaClassifierType@180['E'] {
     arguments = ArrayList@181[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@182['E'] {
     arguments = ArrayList@183[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@184['E'] {
     arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@125['E']
+    classifier = JavaTypeParameterImpl@149['E']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
 }
 
 LazyJavaClassifierType@186['K'] {
@@ -328,59 +323,59 @@ LazyJavaClassifierType@190['K'] {
     arguments = ArrayList@191[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
-LazyJavaClassifierType@193['K'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@195['K']
+LazyJavaClassifierType@194['K'] {
+    arguments = ArrayList@195[empty]
+    classifier = JavaTypeParameterImpl@196['K']
     nullable = 'false': Boolean@111
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@196['K'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaTypeParameterImpl@198['K']
+LazyJavaClassifierType@197['K'] {
+    arguments = ArrayList@198[empty]
+    classifier = JavaTypeParameterImpl@199['K']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@200['K'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaTypeParameterImpl@188['K']
+    classifier = JavaTypeParameterImpl@199['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@202['K'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaTypeParameterImpl@198['K']
+    classifier = JavaTypeParameterImpl@196['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
 LazyJavaClassifierType@204['K'] {
     arguments = ArrayList@205[empty]
     classifier = JavaTypeParameterImpl@192['K']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaClassifierType@206['K'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaTypeParameterImpl@195['K']
+    classifier = JavaTypeParameterImpl@188['K']
     nullable = 'true': Boolean@117
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@189
 }
 
-LazyJavaClassifierType@74['List<E>'] {
+LazyJavaClassifierType@64['List<E>'] {
     arguments = ArrayList@208[1] { TypeProjectionImpl@209 }
     classifier = JavaClassImpl@210['List']
     memberScope = SubstitutingScope@211
     typeConstructor = DeserializedClassTypeConstructor@212
 }
 
-LazyJavaClassifierType@64['List<E>'] {
+LazyJavaClassifierType@74['List<E>'] {
     arguments = ArrayList@213[1] { TypeProjectionImpl@214 }
     classifier = JavaClassImpl@215['List']
     memberScope = SubstitutingScope@216
@@ -464,21 +459,21 @@ LazyJavaClassifierType@255['V'] {
     arguments = ArrayList@256[empty]
     classifier = JavaTypeParameterImpl@257['V']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
-LazyJavaClassifierType@259['V'] {
-    arguments = ArrayList@260[empty]
-    classifier = JavaTypeParameterImpl@261['V']
+LazyJavaClassifierType@258['V'] {
+    arguments = ArrayList@259[empty]
+    classifier = JavaTypeParameterImpl@260['V']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
-LazyJavaClassifierType@262['V'] {
-    arguments = ArrayList@263[empty]
-    classifier = JavaTypeParameterImpl@264['V']
+LazyJavaClassifierType@261['V'] {
+    arguments = ArrayList@262[empty]
+    classifier = JavaTypeParameterImpl@263['V']
     nullable = 'false': Boolean@111
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaClassifierType@265['V'] {
@@ -490,23 +485,23 @@ LazyJavaClassifierType@265['V'] {
 
 LazyJavaClassifierType@267['V'] {
     arguments = ArrayList@268[empty]
-    classifier = JavaTypeParameterImpl@261['V']
+    classifier = JavaTypeParameterImpl@263['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaClassifierType@269['V'] {
     arguments = ArrayList@270[empty]
-    classifier = JavaTypeParameterImpl@264['V']
+    classifier = JavaTypeParameterImpl@257['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
 LazyJavaClassifierType@271['V'] {
     arguments = ArrayList@272[empty]
-    classifier = JavaTypeParameterImpl@257['V']
+    classifier = JavaTypeParameterImpl@260['V']
     nullable = 'true': Boolean@117
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
 }
 
 LazyJavaPackageFragmentProvider@273 {
@@ -535,20 +530,20 @@ LazyJavaPackageFragmentProvider@273 {
     packageFragments('kotlin.io': FqName@301) = null
     packageFragments('kotlin.jvm': FqName@302) = null
     topLevelClasses(JavaClassImpl@90['AbstractCollection']) = LazyJavaClassDescriptor@2['AbstractCollection']
-    topLevelClasses(JavaClassImpl@94['AbstractList']) = LazyJavaClassDescriptor@13['AbstractList']
-    topLevelClasses(JavaClassImpl@99['AbstractMap']) = LazyJavaClassDescriptor@23['AbstractMap']
-    topLevelClasses(JavaClassImpl@303['ArrayList']) = LazyJavaClassDescriptor@25['ArrayList']
-    topLevelClasses(JavaClassImpl@304['HashMap']) = LazyJavaClassDescriptor@40['HashMap']
-    topLevelClasses(JavaClassImpl@245['RandomAccess']) = LazyJavaClassDescriptor@48['RandomAccess']
-    topLevelClasses(JavaClassImpl@248['Serializable']) = LazyJavaClassDescriptor@52['Serializable']
+    topLevelClasses(JavaClassImpl@94['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
+    topLevelClasses(JavaClassImpl@99['AbstractMap']) = LazyJavaClassDescriptor@21['AbstractMap']
+    topLevelClasses(JavaClassImpl@303['ArrayList']) = LazyJavaClassDescriptor@23['ArrayList']
+    topLevelClasses(JavaClassImpl@304['HashMap']) = LazyJavaClassDescriptor@39['HashMap']
+    topLevelClasses(JavaClassImpl@245['RandomAccess']) = LazyJavaClassDescriptor@47['RandomAccess']
+    topLevelClasses(JavaClassImpl@250['Serializable']) = LazyJavaClassDescriptor@52['Serializable']
 }
 
 LazyJavaPackageFragment@285['java'] {
     classes('lang': Name@305) = null // through LazyPackageFragmentScopeForJavaPackage@306
     classes('util': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@306
     deserializedPackageScope = Empty@308 // through LazyPackageFragmentScopeForJavaPackage@306
-    functions('lang': Name@309) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@306
-    functions('util': Name@310) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@306
+    functions('lang': Name@309) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@306
+    functions('util': Name@310) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@306
     memberIndex = computeMemberIndex$1@311 // through LazyPackageFragmentScopeForJavaPackage@306
 }
 
@@ -556,42 +551,40 @@ LazyJavaPackageFragment@289['lang'] {
     classes('ArrayList': Name@312) = null // through LazyPackageFragmentScopeForJavaPackage@313
     classes('Foo': Name@314) = null // through LazyPackageFragmentScopeForJavaPackage@313
     classes('HashMap': Name@315) = null // through LazyPackageFragmentScopeForJavaPackage@313
-    classes('add': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@313
     classes('foos': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@313
     deserializedPackageScope = Empty@308 // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('ArrayList': Name@312) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('Foo': Name@314) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('HashMap': Name@315) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@313
-    functions('add': Name@9) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@313
+    functions('ArrayList': Name@312) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@313
+    functions('Foo': Name@314) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@313
+    functions('HashMap': Name@315) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@313
     memberIndex = computeMemberIndex$1@317 // through LazyPackageFragmentScopeForJavaPackage@313
 }
 
 LazyJavaPackageFragment@294['util'] {
-    classes('ArrayList': Name@318) = LazyJavaClassDescriptor@25['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('HashMap': Name@320) = LazyJavaClassDescriptor@40['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('ArrayList': Name@318) = LazyJavaClassDescriptor@23['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('HashMap': Name@320) = LazyJavaClassDescriptor@39['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@319
     deserializedPackageScope = Empty@308 // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('ArrayList': Name@321) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('HashMap': Name@322) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('ArrayList': Name@321) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('HashMap': Name@322) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@319
     memberIndex = computeMemberIndex$1@323 // through LazyPackageFragmentScopeForJavaPackage@319
 }
 
-LazyJavaTypeParameterDescriptor@61['E'] {
+LazyJavaTypeParameterDescriptor@57['E'] {
     defaultType = JetTypeImpl@324['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
     upperBounds = LinkedHashSet@325[1] { NullableType@326 }
     upperBoundsAsType = NullableType@326
 }
 
-LazyJavaTypeParameterDescriptor@71['E'] {
+LazyJavaTypeParameterDescriptor@61['E'] {
     defaultType = JetTypeImpl@327['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@328[1] { NullableType@329 }
     upperBoundsAsType = NullableType@329
 }
 
-LazyJavaTypeParameterDescriptor@57['E'] {
+LazyJavaTypeParameterDescriptor@71['E'] {
     defaultType = JetTypeImpl@330['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@143
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
     upperBounds = LinkedHashSet@331[1] { NullableType@332 }
     upperBoundsAsType = NullableType@332
 }
@@ -603,21 +596,21 @@ LazyJavaTypeParameterDescriptor@77['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@66['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@199
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@193
 }
 
 LazyJavaTypeParameterDescriptor@78['V'] {
     defaultType = JetTypeImpl@336['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@258
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
     upperBounds = LinkedHashSet@337[1] { NullableType@338 }
 }
 
 LazyJavaTypeParameterDescriptor@67['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@254
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@264
 }
 
 LazyJavaTypeParameterResolver@339 {
-    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@71['E']
+    resolve(JavaTypeParameterImpl@340['E']) = LazyJavaTypeParameterDescriptor@61['E']
 }
 
 LazyJavaTypeParameterResolver@341 {
@@ -625,35 +618,120 @@ LazyJavaTypeParameterResolver@341 {
 }
 
 LazyJavaTypeParameterResolver@343 {
-    resolve(JavaTypeParameterImpl@344['E']) = LazyJavaTypeParameterDescriptor@61['E']
+    resolve(JavaTypeParameterImpl@344['E']) = LazyJavaTypeParameterDescriptor@71['E']
 }
 
 LazyJavaTypeParameterResolver@345 {
-    resolve(JavaTypeParameterImpl@158['E']) = null
-}
-
-LazyJavaTypeParameterResolver@346 {
     resolve(JavaTypeParameterImpl@149['E']) = null
 }
 
-LazyJavaTypeParameterResolver@347 {
+LazyJavaTypeParameterResolver@346 {
     resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
-LazyJavaTypeParameterResolver@348 {
-    resolve(JavaTypeParameterImpl@161['E']) = null
-}
-
-LazyJavaTypeParameterResolver@349 {
+LazyJavaTypeParameterResolver@347 {
     resolve(JavaTypeParameterImpl@125['E']) = null
 }
 
-LazyJavaTypeParameterResolver@350 {
-    resolve(JavaTypeParameterImpl@198['K']) = LazyJavaTypeParameterDescriptor@66['K']
-    resolve(JavaTypeParameterImpl@253['V']) = LazyJavaTypeParameterDescriptor@67['V']
+LazyJavaTypeParameterResolver@348 {
+    resolve(JavaTypeParameterImpl@152['E']) = null
 }
 
-LazyJavaTypeParameterResolver@351 {
-    resolve(JavaTypeParameterImpl@352['K']) = LazyJavaTypeParameterDescriptor@77['K']
-    resolve(JavaTypeParameterImpl@353['V']) = LazyJavaTypeParameterDescriptor@78['V']
+LazyJavaTypeParameterResolver@349 {
+    resolve(JavaTypeParameterImpl@161['E']) = null
+}
+
+LazyJavaTypeParameterResolver@350 {
+    resolve(JavaTypeParameterImpl@351['K']) = LazyJavaTypeParameterDescriptor@77['K']
+    resolve(JavaTypeParameterImpl@352['V']) = LazyJavaTypeParameterDescriptor@78['V']
+}
+
+LazyJavaTypeParameterResolver@353 {
+    resolve(JavaTypeParameterImpl@192['K']) = LazyJavaTypeParameterDescriptor@66['K']
+    resolve(JavaTypeParameterImpl@263['V']) = LazyJavaTypeParameterDescriptor@67['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]
+    <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@358 {
+    <name not found> = ArrayList@359[1] { ResolutionCandidate@360 }
+    <name not found> = ArrayList@361[1] { ResolutionCandidate@360 }
+    <name not found> = EmptyList@48[empty]
+    <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@366 {
+    <name not found> = ArrayList@367[1] { ResolutionCandidate@368 }
+    <name not found> = ArrayList@369[1] { ResolutionCandidate@368 }
+}
+
+ResolutionTaskHolder@370 {
+    <name not found> = ArrayList@371[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+    <name not found> = ArrayList@374[2] { ResolutionCandidate@372, ResolutionCandidate@373 }
+}
+
+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> = 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@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, ... }
+    <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/inference/regressions/kt702.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
index d0971ed76cd..b44cbd61003 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt702.lazy.log
@@ -2,22 +2,18 @@ LazyJavaClassDescriptor@0['AnnotatedElement'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
 }
 
-LazyJavaClassDescriptor@9['Class'] {
-    defaultType = JetTypeImpl@10['Class<1>']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
-    functions('cast': Name@6) = ArrayList@13[1] { JavaMethodDescriptor@14['cast'] } // through LazyJavaClassMemberScope@12
-    functions('isInstance': Name@7) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@12
-    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@12
-    nestedClasses('cast': Name@6) = null // through LazyJavaClassMemberScope@12
-    nestedClasses('isInstance': Name@7) = null // through LazyJavaClassMemberScope@12
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+LazyJavaClassDescriptor@7['Class'] {
+    defaultType = JetTypeImpl@8['Class<1>']
+    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
+    functions('cast': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['cast'] } // through LazyJavaClassMemberScope@10
+    functions('isInstance': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@10
+    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@10
+    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@10
+    nestedClasses('cast': Name@11) = null // through LazyJavaClassMemberScope@10
+    nestedClasses('isInstance': Name@14) = null // through LazyJavaClassMemberScope@10
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@20['Class']
 }
@@ -34,8 +30,6 @@ LazyJavaClassDescriptor@25['GenericDeclaration'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
 }
 
@@ -47,8 +41,6 @@ LazyJavaClassDescriptor@31['Serializable'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
     memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
     typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
 }
 
@@ -56,12 +48,10 @@ LazyJavaClassDescriptor@35['Type'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
     memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
     typeConstructor = LazyJavaClassTypeConstructor@38['Type']
 }
 
-LazyJavaClassTypeConstructor@8['AnnotatedElement'] {
+LazyJavaClassTypeConstructor@6['AnnotatedElement'] {
     parameters = ArrayList@39[empty]
     supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
 }
@@ -105,7 +95,7 @@ LazyJavaClassifierType@63['AnnotatedElement'] {
     arguments = ArrayList@64[empty]
     classifier = JavaClassImpl@65['AnnotatedElement']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
 }
 
 LazyJavaClassifierType@58['Exception'] {
@@ -139,7 +129,7 @@ LazyJavaClassifierType@76['Object'] {
 
 LazyJavaClassifierType@79['Object'] {
     arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@72['Object']
+    classifier = JavaClassImpl@78['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -147,7 +137,7 @@ LazyJavaClassifierType@79['Object'] {
 
 LazyJavaClassifierType@82['Object'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaClassImpl@78['Object']
+    classifier = JavaClassImpl@72['Object']
     memberScope = DeserializedClassMemberScope@73
     nullable = 'true': Boolean@81
     typeConstructor = DeserializedClassTypeConstructor@75
@@ -199,13 +189,13 @@ LazyJavaClassifierType@100['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@50['Throwable'] {
+LazyJavaClassifierType@53['Throwable'] {
     arguments = ArrayList@102[empty]
     classifier = JavaClassImpl@103['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
 }
 
-LazyJavaClassifierType@53['Throwable'] {
+LazyJavaClassifierType@50['Throwable'] {
     arguments = ArrayList@105[empty]
     classifier = JavaClassImpl@106['Throwable']
     typeConstructor = DeserializedClassTypeConstructor@104
@@ -259,7 +249,7 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kotlin.io': FqName@152) = null
     packageFragments('kotlin.jvm': FqName@153) = null
     topLevelClasses(JavaClassImpl@65['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@154['Class']) = LazyJavaClassDescriptor@9['Class']
+    topLevelClasses(JavaClassImpl@154['Class']) = LazyJavaClassDescriptor@7['Class']
     topLevelClasses(JavaClassImpl@155['Error']) = LazyJavaClassDescriptor@21['Error']
     topLevelClasses(JavaClassImpl@67['Exception']) = LazyJavaClassDescriptor@23['Exception']
     topLevelClasses(JavaClassImpl@69['GenericDeclaration']) = LazyJavaClassDescriptor@25['GenericDeclaration']
@@ -276,20 +266,16 @@ LazyJavaPackageFragment@130['java'] {
 }
 
 LazyJavaPackageFragment@134['lang'] {
-    classes('Class': Name@162) = LazyJavaClassDescriptor@9['Class'] // through LazyPackageFragmentScopeForJavaPackage@163
+    classes('Class': Name@162) = LazyJavaClassDescriptor@7['Class'] // through LazyPackageFragmentScopeForJavaPackage@163
     classes('Error': Name@164) = LazyJavaClassDescriptor@21['Error'] // through LazyPackageFragmentScopeForJavaPackage@163
     classes('RuntimeException': Name@165) = LazyJavaClassDescriptor@29['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('cast': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@163
     classes('equals': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@163
     classes('getJavaClass': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('isInstance': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@163
     classes('java': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@163
     classes('propagateIfInstanceOf': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@163
     deserializedPackageScope = Empty@159 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('cast': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     functions('equals': Name@166) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     functions('getJavaClass': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('isInstance': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     functions('propagateIfInstanceOf': Name@169) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@163
     memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@163
 }
@@ -307,3 +293,171 @@ LazyJavaTypeParameterResolver@174 {
 LazyJavaTypeParameterResolver@176 {
     resolve(JavaTypeParameterImpl@98['T']) = null
 }
+
+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> = 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]
+    <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@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]
+    <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@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 }
+}
+
+ResolutionTaskHolder@240 {
+    <name not found> = ArrayList@241[1] { ResolutionCandidate@242 }
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@242 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
index 1956d8cf5fc..ae95a875255 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt731.lazy.log
@@ -42,12 +42,65 @@ LazyJavaPackageFragment@17['java'] {
 LazyJavaPackageFragment@19['lang'] {
     classes('A': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
     classes('foo': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('x': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('x': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
     deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
     functions('A': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     functions('foo': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('x': Name@43) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('x': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@37[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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
index eeea43c1c7f..a5049f8ca83 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt742.lazy.log
@@ -44,3 +44,168 @@ LazyJavaPackageFragment@15['lang'] {
     functions('sure': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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@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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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@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]
+    <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]
+    <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]
+    <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]
+}
+
+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@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[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
index be6c7bcd48d..c9f19a09487 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt832.lazy.log
@@ -21,9 +21,26 @@ LazyJavaPackageFragment@7['java'] {
 
 LazyJavaPackageFragment@9['lang'] {
     classes('fooT2': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
     functions('fooT2': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('invoke': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log b/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
index 65fc1359e3f..5f12455e28e 100644
--- a/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/regressions/kt943.lazy.log
@@ -15,431 +15,500 @@ LazyJavaClassDescriptor@5['Collections'] {
     functions('comparator': Name@8) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
     functions('max': Name@11) = ArrayList@12[3] { JavaMethodDescriptor@13['max'], JavaMethodDescriptor@14['max'], SamAdapterFunctionDescriptor@15['max'] } // through LazyJavaStaticClassScope@10
     functions('max': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('minus': Name@16) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('minus': Name@16) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@7
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaStaticClassScope@10
-    nestedClassIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@7
-    nestedClasses('Any': Name@21) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('Int': Name@22) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('List': Name@23) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('String': Name@24) = null // through LazyJavaClassMemberScope@7
+    functions('sure': Name@16) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
+    functions('sure': Name@16) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
+    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaStaticClassScope@10
+    nestedClassIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@7
+    nestedClasses('Any': Name@20) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('Int': Name@21) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('List': Name@22) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('String': Name@23) = null // through LazyJavaClassMemberScope@7
     nestedClasses('comparator': Name@8) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('inline': Name@25) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('inline': Name@24) = null // through LazyJavaClassMemberScope@7
     nestedClasses('max': Name@11) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('minus': Name@16) = null // through LazyJavaClassMemberScope@7
-    nestedClasses('sure': Name@17) = null // through LazyJavaClassMemberScope@7
+    nestedClasses('sure': Name@16) = null // through LazyJavaClassMemberScope@7
     properties('comparator': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
     properties('comparator': Name@8) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    properties('length': Name@26) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('length': Name@26) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
     properties('max': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
     properties('max': Name@11) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    properties('minus': Name@16) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('minus': Name@16) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    properties('sure': Name@17) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('sure': Name@17) = EmptyList@9[empty] // through LazyJavaStaticClassScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@27['Collections']
+    typeConstructor = LazyJavaClassTypeConstructor@25['Collections']
 }
 
-LazyJavaClassDescriptor@28['Comparator'] {
-    functionTypeForSamInterface = JetTypeImpl@29['Function2<3>']
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@31['Comparator']
+LazyJavaClassDescriptor@26['Comparator'] {
+    functionTypeForSamInterface = JetTypeImpl@27['Function2<3>']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@28['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
 }
 
-LazyJavaClassTypeConstructor@27['Collections'] {
-    supertypes = ArrayList@32[1] { JetTypeImpl@33['Any'] }
+LazyJavaClassTypeConstructor@25['Collections'] {
+    supertypes = ArrayList@30[1] { JetTypeImpl@31['Any'] }
 }
 
-LazyJavaClassTypeConstructor@31['Comparator'] {
-    parameters = ArrayList@34[1] { LazyJavaTypeParameterDescriptor@35['T'] }
-    supertypes = ArrayList@36[1] { JetTypeImpl@33['Any'] }
+LazyJavaClassTypeConstructor@29['Comparator'] {
+    parameters = ArrayList@32[1] { LazyJavaTypeParameterDescriptor@33['T'] }
+    supertypes = ArrayList@34[1] { JetTypeImpl@31['Any'] }
 }
 
-LazyJavaClassifierType@37['Collection<? extends T>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@40['Collection']
-    memberScope = SubstitutingScope@41
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@43
+LazyJavaClassifierType@35['Collection<? extends T>'] {
+    arguments = ArrayList@36[1] { TypeProjectionImpl@37 }
+    classifier = JavaClassImpl@38['Collection']
+    memberScope = SubstitutingScope@39
+    nullable = 'false': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaClassifierType@44['Collection<? extends T>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['Collection']
-    memberScope = SubstitutingScope@48
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@43
+LazyJavaClassifierType@42['Collection<? extends T>'] {
+    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
+    classifier = JavaClassImpl@45['Collection']
+    memberScope = SubstitutingScope@46
+    nullable = 'false': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaClassifierType@49['Collection<? extends T>'] {
-    arguments = ArrayList@50[1] { TypeProjectionImpl@51 }
-    classifier = JavaClassImpl@40['Collection']
-    memberScope = SubstitutingScope@52
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@54
+LazyJavaClassifierType@47['Collection<? extends T>'] {
+    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
+    classifier = JavaClassImpl@38['Collection']
+    memberScope = SubstitutingScope@50
+    nullable = 'true': Boolean@51
+    typeConstructor = DeserializedClassTypeConstructor@52
 }
 
-LazyJavaClassifierType@55['Collection<? extends T>'] {
-    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
-    classifier = JavaClassImpl@47['Collection']
-    memberScope = SubstitutingScope@58
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@54
+LazyJavaClassifierType@53['Collection<? extends T>'] {
+    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
+    classifier = JavaClassImpl@45['Collection']
+    memberScope = SubstitutingScope@56
+    nullable = 'true': Boolean@51
+    typeConstructor = DeserializedClassTypeConstructor@52
 }
 
-LazyJavaClassifierType@59['Comparable<? super T>'] {
-    arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
-    classifier = JavaClassImpl@62['Comparable']
-    memberScope = SubstitutingScope@63
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@64
+LazyJavaClassifierType@57['Comparable<? super T>'] {
+    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
+    classifier = JavaClassImpl@60['Comparable']
+    memberScope = SubstitutingScope@61
+    nullable = 'false': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
-LazyJavaClassifierType@65['Comparable<? super T>'] {
-    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
-    classifier = JavaClassImpl@62['Comparable']
-    memberScope = SubstitutingScope@68
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@64
+LazyJavaClassifierType@63['Comparable<? super T>'] {
+    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
+    classifier = JavaClassImpl@60['Comparable']
+    memberScope = SubstitutingScope@66
+    nullable = 'true': Boolean@51
+    typeConstructor = DeserializedClassTypeConstructor@62
 }
 
-LazyJavaClassifierType@69['Comparator<? super T>'] {
-    arguments = ArrayList@70[1] { TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['Comparator']
-    memberScope = SubstitutingScope@73
-    nullable = 'false': Boolean@42
-    typeConstructor = LazyJavaClassTypeConstructor@31['Comparator']
+LazyJavaClassifierType@67['Comparator<? super T>'] {
+    arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
+    classifier = JavaClassImpl@70['Comparator']
+    memberScope = SubstitutingScope@71
+    nullable = 'false': Boolean@40
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
 }
 
-LazyJavaClassifierType@74['Comparator<? super T>'] {
-    arguments = ArrayList@75[1] { TypeProjectionImpl@76 }
-    classifier = JavaClassImpl@72['Comparator']
-    memberScope = SubstitutingScope@77
-    nullable = 'true': Boolean@53
-    typeConstructor = LazyJavaClassTypeConstructor@31['Comparator']
+LazyJavaClassifierType@72['Comparator<? super T>'] {
+    arguments = ArrayList@73[1] { TypeProjectionImpl@74 }
+    classifier = JavaClassImpl@70['Comparator']
+    memberScope = SubstitutingScope@75
+    nullable = 'true': Boolean@51
+    typeConstructor = LazyJavaClassTypeConstructor@29['Comparator']
 }
 
-LazyJavaClassifierType@78['Object'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaClassImpl@80['Object']
-    memberScope = DeserializedClassMemberScope@81
-    nullable = 'false': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@82
+LazyJavaClassifierType@76['Object'] {
+    arguments = ArrayList@77[empty]
+    classifier = JavaClassImpl@78['Object']
+    memberScope = DeserializedClassMemberScope@79
+    nullable = 'false': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@80
+}
+
+LazyJavaClassifierType@81['Object'] {
+    arguments = ArrayList@82[empty]
+    classifier = JavaClassImpl@78['Object']
+    memberScope = DeserializedClassMemberScope@79
+    nullable = 'true': Boolean@51
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@83['Object'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaClassImpl@80['Object']
-    memberScope = DeserializedClassMemberScope@81
-    nullable = 'true': Boolean@53
-    typeConstructor = DeserializedClassTypeConstructor@82
+    classifier = JavaClassImpl@84['Object']
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
 LazyJavaClassifierType@85['Object'] {
     classifier = JavaClassImpl@86['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
+    typeConstructor = DeserializedClassTypeConstructor@80
 }
 
-LazyJavaClassifierType@87['Object'] {
-    classifier = JavaClassImpl@88['Object']
-    typeConstructor = DeserializedClassTypeConstructor@82
+LazyJavaClassifierType@87['T'] {
+    arguments = ArrayList@88[empty]
+    classifier = JavaTypeParameterImpl@89['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@89['T'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@91['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@91['T'] {
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@93['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@93['T'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@95['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+LazyJavaClassifierType@94['T'] {
+    arguments = ArrayList@95[empty]
+    classifier = JavaTypeParameterImpl@96['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@97['T'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@99['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@98['T'] {
+    arguments = ArrayList@99[empty]
+    classifier = JavaTypeParameterImpl@100['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@100['T'] {
-    arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@102['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+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@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@107['T'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@110['T'] {
     arguments = ArrayList@111[empty]
     classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
-LazyJavaClassifierType@113['T'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@114['T'] {
+    arguments = ArrayList@115[empty]
+    classifier = JavaTypeParameterImpl@116['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
-LazyJavaClassifierType@116['T'] {
-    arguments = ArrayList@117[empty]
-    classifier = JavaTypeParameterImpl@118['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+LazyJavaClassifierType@117['T'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaTypeParameterImpl@119['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
-LazyJavaClassifierType@119['T'] {
-    arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@121['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+LazyJavaClassifierType@120['T'] {
+    arguments = ArrayList@121[empty]
+    classifier = JavaTypeParameterImpl@122['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@122['T'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@124['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+LazyJavaClassifierType@123['T'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaTypeParameterImpl@125['T']
+    nullable = 'false': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@125['T'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@127['T']
-    nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+LazyJavaClassifierType@126['T'] {
+    arguments = ArrayList@127[empty]
+    classifier = JavaTypeParameterImpl@116['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@128['T'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@112['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@93['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@130['T'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@106['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    classifier = JavaTypeParameterImpl@125['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@132['T'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@118['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+    classifier = JavaTypeParameterImpl@119['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@134['T'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@95['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+    classifier = JavaTypeParameterImpl@100['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@136['T'] {
     arguments = ArrayList@137[empty]
     classifier = JavaTypeParameterImpl@109['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@138['T'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@99['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@89['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
 LazyJavaClassifierType@140['T'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@91['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@106['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@142['T'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@121['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    classifier = JavaTypeParameterImpl@112['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
 }
 
 LazyJavaClassifierType@144['T'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@102['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    classifier = JavaTypeParameterImpl@103['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@146['T'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@127['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@96['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@148['T'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@115['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
+    classifier = JavaTypeParameterImpl@122['T']
+    nullable = 'true': Boolean@51
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
 }
 
-LazyJavaClassifierType@150['T'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@124['T']
-    nullable = 'true': Boolean@53
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+LazyJavaPackageFragmentProvider@150 {
+    packageFragments('<root>': FqName@151) = LazyJavaPackageFragment@152['<root>']
+    packageFragments('Any': FqName@153) = null
+    packageFragments('Comparator': FqName@154) = null
+    packageFragments('Int': FqName@155) = null
+    packageFragments('List': FqName@156) = null
+    packageFragments('String': FqName@157) = null
+    packageFragments('T': FqName@158) = null
+    packageFragments('inline': FqName@159) = null
+    packageFragments('java': FqName@160) = LazyJavaPackageFragment@161['java']
+    packageFragments('java.lang': FqName@162) = LazyJavaPackageFragment@163['lang']
+    packageFragments('java.lang.Any': FqName@164) = null
+    packageFragments('java.lang.Comparator': FqName@165) = null
+    packageFragments('java.lang.Int': FqName@166) = null
+    packageFragments('java.lang.List': FqName@167) = null
+    packageFragments('java.lang.String': FqName@168) = null
+    packageFragments('java.lang.T': FqName@169) = null
+    packageFragments('java.lang.inline': FqName@170) = null
+    packageFragments('java.util': FqName@171) = LazyJavaPackageFragment@172['util']
+    packageFragments('java.util.Any': FqName@173) = null
+    packageFragments('java.util.Collections': FqName@174) = null
+    packageFragments('java.util.Comparator': FqName@175) = null
+    packageFragments('java.util.Int': FqName@176) = null
+    packageFragments('java.util.List': FqName@177) = null
+    packageFragments('java.util.String': FqName@178) = null
+    packageFragments('java.util.T': FqName@179) = null
+    packageFragments('java.util.inline': FqName@180) = null
+    packageFragments('kotlin': FqName@181) = null
+    packageFragments('kotlin.Any': FqName@182) = null
+    packageFragments('kotlin.Comparator': FqName@183) = null
+    packageFragments('kotlin.Int': FqName@184) = null
+    packageFragments('kotlin.List': FqName@185) = null
+    packageFragments('kotlin.String': FqName@186) = null
+    packageFragments('kotlin.T': FqName@187) = null
+    packageFragments('kotlin.inline': FqName@188) = null
+    packageFragments('kotlin.io': FqName@189) = null
+    packageFragments('kotlin.jvm': FqName@190) = null
+    packageFragments('maze': FqName@191) = null
+    packageFragments('maze.Any': FqName@192) = null
+    packageFragments('maze.Comparator': FqName@193) = null
+    packageFragments('maze.Int': FqName@194) = null
+    packageFragments('maze.List': FqName@195) = null
+    packageFragments('maze.String': FqName@196) = null
+    packageFragments('maze.T': FqName@197) = null
+    packageFragments('maze.inline': FqName@198) = null
+    topLevelClasses(JavaClassImpl@199['Collections']) = LazyJavaClassDescriptor@5['Collections']
+    topLevelClasses(JavaClassImpl@200['Comparator']) = LazyJavaClassDescriptor@26['Comparator']
+    topLevelClasses(JavaClassImpl@201['List']) = LazyJavaClassDescriptor@202['List']
 }
 
-LazyJavaPackageFragmentProvider@152 {
-    packageFragments('<root>': FqName@153) = LazyJavaPackageFragment@154['<root>']
-    packageFragments('Any': FqName@155) = null
-    packageFragments('Comparator': FqName@156) = null
-    packageFragments('Int': FqName@157) = null
-    packageFragments('List': FqName@158) = null
-    packageFragments('String': FqName@159) = null
-    packageFragments('T': FqName@160) = null
-    packageFragments('inline': FqName@161) = null
-    packageFragments('java': FqName@162) = LazyJavaPackageFragment@163['java']
-    packageFragments('java.lang': FqName@164) = LazyJavaPackageFragment@165['lang']
-    packageFragments('java.lang.Any': FqName@166) = null
-    packageFragments('java.lang.Comparator': FqName@167) = null
-    packageFragments('java.lang.Int': FqName@168) = null
-    packageFragments('java.lang.List': FqName@169) = null
-    packageFragments('java.lang.String': FqName@170) = null
-    packageFragments('java.lang.T': FqName@171) = null
-    packageFragments('java.lang.inline': FqName@172) = null
-    packageFragments('java.util': FqName@173) = LazyJavaPackageFragment@174['util']
-    packageFragments('java.util.Any': FqName@175) = null
-    packageFragments('java.util.Collections': FqName@176) = null
-    packageFragments('java.util.Comparator': FqName@177) = null
-    packageFragments('java.util.Int': FqName@178) = null
-    packageFragments('java.util.List': FqName@179) = null
-    packageFragments('java.util.String': FqName@180) = null
-    packageFragments('java.util.T': FqName@181) = null
-    packageFragments('java.util.inline': FqName@182) = null
-    packageFragments('kotlin': FqName@183) = null
-    packageFragments('kotlin.Any': FqName@184) = null
-    packageFragments('kotlin.Comparator': FqName@185) = null
-    packageFragments('kotlin.Int': FqName@186) = null
-    packageFragments('kotlin.List': FqName@187) = null
-    packageFragments('kotlin.String': FqName@188) = null
-    packageFragments('kotlin.T': FqName@189) = null
-    packageFragments('kotlin.inline': FqName@190) = null
-    packageFragments('kotlin.io': FqName@191) = null
-    packageFragments('kotlin.jvm': FqName@192) = null
-    packageFragments('maze': FqName@193) = null
-    packageFragments('maze.Any': FqName@194) = null
-    packageFragments('maze.Comparator': FqName@195) = null
-    packageFragments('maze.Int': FqName@196) = null
-    packageFragments('maze.List': FqName@197) = null
-    packageFragments('maze.String': FqName@198) = null
-    packageFragments('maze.T': FqName@199) = null
-    packageFragments('maze.inline': FqName@200) = null
-    topLevelClasses(JavaClassImpl@201['Collections']) = LazyJavaClassDescriptor@5['Collections']
-    topLevelClasses(JavaClassImpl@202['Comparator']) = LazyJavaClassDescriptor@28['Comparator']
-    topLevelClasses(JavaClassImpl@203['List']) = LazyJavaClassDescriptor@204['List']
+LazyJavaPackageFragment@161['java'] {
+    classes('lang': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@204
+    classes('util': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@204
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@204
+    functions('lang': Name@207) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@204
+    functions('util': Name@208) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@204
+    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@204
 }
 
-LazyJavaPackageFragment@163['java'] {
-    classes('lang': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@206
-    classes('util': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@206
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@206
-    functions('lang': Name@209) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@206
-    functions('util': Name@210) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@206
-    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@206
+LazyJavaPackageFragment@163['lang'] {
+    classes('comparator': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('max': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('sure': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@210
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('comparator': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('max': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('sure': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@210
 }
 
-LazyJavaPackageFragment@165['lang'] {
+LazyJavaPackageFragment@172['util'] {
+    classes('Any': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('Collections': Name@213) = LazyJavaClassDescriptor@5['Collections'] // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('Comparator': Name@214) = LazyJavaClassDescriptor@26['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('List': Name@22) = LazyJavaClassDescriptor@202['List'] // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('String': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@212
     classes('comparator': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('inline': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@212
     classes('max': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('minus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    classes('sure': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('sure': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@212
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@212
+    functions('Collections': Name@215) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
     functions('comparator': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
     functions('max': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('minus': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@212
+    functions('sure': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@212
+    memberIndex = computeMemberIndex$1@216 // through LazyPackageFragmentScopeForJavaPackage@212
 }
 
-LazyJavaPackageFragment@174['util'] {
-    classes('Any': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('Collections': Name@215) = LazyJavaClassDescriptor@5['Collections'] // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('Comparator': Name@216) = LazyJavaClassDescriptor@28['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('List': Name@23) = LazyJavaClassDescriptor@204['List'] // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('comparator': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('inline': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('max': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('minus': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    classes('sure': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@214
-    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('Collections': Name@217) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('comparator': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('max': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('minus': Name@16) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    functions('sure': Name@17) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@214
-    memberIndex = computeMemberIndex$1@218 // through LazyPackageFragmentScopeForJavaPackage@214
+LazyJavaTypeParameterDescriptor@33['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
+    upperBounds = LinkedHashSet@217[1] { NullableType@218 }
+    upperBoundsAsType = NullableType@218
 }
 
 LazyJavaTypeParameterDescriptor@219['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
     upperBounds = LinkedHashSet@220[1] { NullableType@221 }
     upperBoundsAsType = NullableType@221
 }
 
-LazyJavaTypeParameterDescriptor@35['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
-    upperBounds = LinkedHashSet@222[1] { NullableType@223 }
-    upperBoundsAsType = NullableType@223
+LazyJavaTypeParameterDescriptor@222['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    upperBounds = LinkedHashSet@223[2] { DelegatingFlexibleType@224, DelegatingFlexibleType@225 }
+    upperBoundsAsType = NotNullType@226
 }
 
-LazyJavaTypeParameterDescriptor@224['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@92
-    upperBounds = LinkedHashSet@225[2] { DelegatingFlexibleType@226, DelegatingFlexibleType@227 }
-    upperBoundsAsType = NotNullType@228
+LazyJavaTypeParameterResolver@227 {
+    resolve(JavaTypeParameterImpl@228['T']) = LazyJavaTypeParameterDescriptor@33['T']
 }
 
 LazyJavaTypeParameterResolver@229 {
-    resolve(JavaTypeParameterImpl@230['T']) = LazyJavaTypeParameterDescriptor@35['T']
+    resolve(JavaTypeParameterImpl@230['T']) = LazyJavaTypeParameterDescriptor@219['T']
 }
 
 LazyJavaTypeParameterResolver@231 {
-    resolve(JavaTypeParameterImpl@232['T']) = LazyJavaTypeParameterDescriptor@219['T']
+    resolve(JavaTypeParameterImpl@232['T']) = LazyJavaTypeParameterDescriptor@222['T']
 }
 
 LazyJavaTypeParameterResolver@233 {
-    resolve(JavaTypeParameterImpl@234['T']) = LazyJavaTypeParameterDescriptor@224['T']
+    resolve(JavaTypeParameterImpl@112['T']) = null
 }
 
-LazyJavaTypeParameterResolver@235 {
-    resolve(JavaTypeParameterImpl@95['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]
+    <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@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> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+}
+
+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@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 }
+    <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 8e043960356..553a9081ada 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@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
-LazyJavaClassifierType@59['E'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['E']
+LazyJavaClassifierType@60['E'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
-LazyJavaClassifierType@62['E'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+LazyJavaClassifierType@63['E'] {
+    arguments = ArrayList@64[empty]
+    classifier = JavaTypeParameterImpl@65['E']
     nullable = 'false': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 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@68['E'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@58['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
-}
-
-LazyJavaClassifierType@70['E'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
 LazyJavaClassifierType@72['E'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@61['E']
+    classifier = JavaTypeParameterImpl@58['E']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@24['List<E>'] {
@@ -226,12 +226,12 @@ LazyJavaPackageFragment@105['util'] {
 
 LazyJavaTypeParameterDescriptor@26['E'] {
     defaultType = JetTypeImpl@135['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
     upperBounds = LinkedHashSet@136[1] { NullableType@137 }
 }
 
 LazyJavaTypeParameterDescriptor@21['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@55
 }
 
 LazyJavaTypeParameterResolver@138 {
@@ -239,5 +239,93 @@ LazyJavaTypeParameterResolver@138 {
 }
 
 LazyJavaTypeParameterResolver@140 {
-    resolve(JavaTypeParameterImpl@64['E']) = LazyJavaTypeParameterDescriptor@21['E']
+    resolve(JavaTypeParameterImpl@54['E']) = LazyJavaTypeParameterDescriptor@21['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]
+    <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 }
+    <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@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]
+    <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@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[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
+    <name not found> = ArrayList@190[3] { ResolutionCandidate@187, ResolutionCandidate@188, ResolutionCandidate@189 }
+    <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 2abbb824c8d..f749ec7d6a9 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/ErrorTypeAsGenericParameter.lazy.log
@@ -50,10 +50,73 @@ LazyJavaPackageFragment@21['java'] {
 LazyJavaPackageFragment@23['lang'] {
     classes('aaa': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
     classes('foo': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('plus': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
     deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('aaa': Name@51) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('aaa': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     functions('foo': Name@49) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('plus': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@48
+}
+
+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@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@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]
+    <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]
+    <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]
+}
+
+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]
+    <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/reportingImprovements/FunctionPlaceholder.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
index c6a41bcf73e..78a6a5837c6 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/FunctionPlaceholder.lazy.log
@@ -44,11 +44,191 @@ LazyJavaPackageFragment@20['lang'] {
     classes('bar': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('foo': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('it': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('plus': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
     deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
     functions('bar': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     functions('foo': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('it': Name@45) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('plus': Name@44) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('it': Name@44) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <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@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 }
+}
+
+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 }
+}
+
+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[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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <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 22dac84a6fd..5f598919a7f 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/NoAmbiguityForDifferentFunctionTypes.lazy.log
@@ -55,3 +55,67 @@ LazyJavaPackageFragment@22['lang'] {
     functions('xs': Name@49) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <name not found> = EmptyList@43[empty]
+    <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@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]
+    <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/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
index d497fec5276..9878048eee4 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/cannotInferParameterTypeWithInference.lazy.log
@@ -44,3 +44,26 @@ LazyJavaPackageFragment@17['lang'] {
     functions('foo': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
index d16cb9aeb72..12988908007 100644
--- a/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/reportingImprovements/subtypeForInvariantWithErrorGenerics.lazy.log
@@ -33,18 +33,94 @@ LazyJavaPackageFragment@14['java'] {
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('add': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('arrayListOf': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('bar': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('arrayListOf': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('bar': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('f': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('foo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
     deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('add': Name@32) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('arrayListOf': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@36) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@37) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@38) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('arrayListOf': Name@32) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('bar': Name@34) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('f': Name@35) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('foo': Name@36) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
+}
+
+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]
+    <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]
+}
+
+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@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@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> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
index 569aaee862f..b1c2253199c 100644
--- a/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/tryNumberLowerBoundsBeforeUpperBounds.lazy.log
@@ -33,7 +33,7 @@ LazyJavaClassifierType@19['String'] {
 
 LazyJavaClassifierType@22['String'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -47,7 +47,7 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@27['String'] {
     arguments = ArrayList@28[empty]
-    classifier = JavaClassImpl@13['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -75,7 +75,7 @@ LazyJavaClassifierType@36['Throwable'] {
 
 LazyJavaClassifierType@39['Throwable'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@31['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@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -123,33 +123,78 @@ LazyJavaPackageFragment@49['<root>'] {
     classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
     classes('Exception': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
     classes('Iterator': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('compareTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('iterate': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('minus': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Exception': Name@69) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('compareTo': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('iterate': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('minus': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('iterate': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('iterate': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@68
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('lang': Name@79) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('Exception': Name@69) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('compareTo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('iterate': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('minus': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('Exception': Name@69) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('compareTo': Name@71) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('iterate': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('minus': Name@73) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('Exception': Name@69) = LazyJavaClassDescriptor@0['Exception'] // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('iterate': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('Exception': Name@69) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('iterate': Name@71) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
+}
+
+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@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[4] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <name not found> = ArrayList@110[5] { ResolutionCandidate@107, ResolutionCandidate@108, ResolutionCandidate@109, ... }
+    <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 26592a4c05d..052b7b0acf1 100644
--- a/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/typeConstructorMismatch.lazy.log
@@ -60,3 +60,79 @@ LazyJavaPackageFragment@16['util'] {
     functions('elemAndListWithReceiver': Name@47) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@50
 }
+
+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]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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@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]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <name not found> = EmptyList@42[empty]
+    <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@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> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
index d318d89eedc..5cbe3ab825a 100644
--- a/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/typeInferenceExpectedTypeMismatch.lazy.log
@@ -110,24 +110,24 @@ LazyJavaClassifierType@66['E'] {
 
 LazyJavaClassifierType@69['E'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@68['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@59
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 LazyJavaClassifierType@71['E'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@64['E']
+    classifier = JavaTypeParameterImpl@68['E']
     nullable = 'true': Boolean@59
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
-LazyJavaClassifierType@35['List<E>'] {
+LazyJavaClassifierType@30['List<E>'] {
     classifier = JavaClassImpl@73['List']
     typeConstructor = DeserializedClassTypeConstructor@74
 }
 
-LazyJavaClassifierType@30['List<E>'] {
+LazyJavaClassifierType@35['List<E>'] {
     classifier = JavaClassImpl@75['List']
     typeConstructor = DeserializedClassTypeConstructor@74
 }
@@ -180,21 +180,21 @@ LazyJavaClassifierType@93['String'] {
 
 LazyJavaClassifierType@96['String'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@92['String']
+    classifier = JavaClassImpl@88['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
 
 LazyJavaClassifierType@98['String'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@88['String']
+    classifier = JavaClassImpl@95['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
 
 LazyJavaClassifierType@100['String'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaClassImpl@95['String']
+    classifier = JavaClassImpl@92['String']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@89
 }
@@ -229,14 +229,14 @@ LazyJavaClassifierType@112['Throwable'] {
 
 LazyJavaClassifierType@114['Throwable'] {
     arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@104['Throwable']
+    classifier = JavaClassImpl@111['Throwable']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@105
 }
 
 LazyJavaClassifierType@116['Throwable'] {
     arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@111['Throwable']
+    classifier = JavaClassImpl@104['Throwable']
     nullable = 'true': Boolean@59
     typeConstructor = DeserializedClassTypeConstructor@105
 }
@@ -386,3 +386,210 @@ LazyJavaTypeParameterDescriptor@32['E'] {
 LazyJavaTypeParameterResolver@229 {
     resolve(JavaTypeParameterImpl@230['E']) = LazyJavaTypeParameterDescriptor@32['E']
 }
+
+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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+ResolutionTaskHolder@239 {
+    <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> = 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]
+    <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 }
+    <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@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@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[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[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> = 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]
+    <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, ... }
+    <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 e86426b3fda..1309a6908f2 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@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-LazyJavaClassifierType@73['E'] {
-    arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@75['E']
+LazyJavaClassifierType@74['E'] {
+    arguments = ArrayList@75[empty]
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+LazyJavaClassifierType@77['E'] {
+    arguments = ArrayList@78[empty]
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@80['E'] {
@@ -124,9 +124,9 @@ LazyJavaClassifierType@80['E'] {
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@72['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@86['E'] {
@@ -138,16 +138,16 @@ LazyJavaClassifierType@86['E'] {
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@75['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@92['E'] {
@@ -172,12 +172,12 @@ LazyJavaClassifierType@99['Serializable'] {
     typeConstructor = LazyJavaClassTypeConstructor@21['Serializable']
 }
 
-LazyJavaClassifierType@30['Set<E>'] {
+LazyJavaClassifierType@38['Set<E>'] {
     classifier = JavaClassImpl@101['Set']
     typeConstructor = DeserializedClassTypeConstructor@102
 }
 
-LazyJavaClassifierType@38['Set<E>'] {
+LazyJavaClassifierType@30['Set<E>'] {
     classifier = JavaClassImpl@103['Set']
     typeConstructor = DeserializedClassTypeConstructor@102
 }
@@ -205,14 +205,14 @@ LazyJavaClassifierType@111['String'] {
 
 LazyJavaClassifierType@114['String'] {
     arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@110['String']
+    classifier = JavaClassImpl@106['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@107
 }
 
 LazyJavaClassifierType@116['String'] {
     arguments = ArrayList@117[empty]
-    classifier = JavaClassImpl@106['String']
+    classifier = JavaClassImpl@110['String']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@107
 }
@@ -254,14 +254,14 @@ LazyJavaClassifierType@130['Throwable'] {
 
 LazyJavaClassifierType@132['Throwable'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@129['Throwable']
+    classifier = JavaClassImpl@126['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@123
 }
 
 LazyJavaClassifierType@134['Throwable'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@126['Throwable']
+    classifier = JavaClassImpl@129['Throwable']
     nullable = 'true': Boolean@61
     typeConstructor = DeserializedClassTypeConstructor@123
 }
@@ -339,26 +339,87 @@ LazyJavaPackageFragment@164['util'] {
 
 LazyJavaTypeParameterDescriptor@35['E'] {
     defaultType = JetTypeImpl@193['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
     upperBounds = LinkedHashSet@194[1] { NullableType@195 }
 }
 
-LazyJavaTypeParameterDescriptor@27['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+LazyJavaTypeParameterDescriptor@23['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-LazyJavaTypeParameterDescriptor@23['E'] {
+LazyJavaTypeParameterDescriptor@27['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaTypeParameterResolver@196 {
-    resolve(JavaTypeParameterImpl@197['E']) = LazyJavaTypeParameterDescriptor@35['E']
+    resolve(JavaTypeParameterImpl@68['E']) = LazyJavaTypeParameterDescriptor@23['E']
+}
+
+LazyJavaTypeParameterResolver@197 {
+    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@27['E']
 }
 
 LazyJavaTypeParameterResolver@198 {
-    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@23['E']
+    resolve(JavaTypeParameterImpl@199['E']) = LazyJavaTypeParameterDescriptor@35['E']
 }
 
-LazyJavaTypeParameterResolver@199 {
-    resolve(JavaTypeParameterImpl@78['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]
+    <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]
+    <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]
+}
+
+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[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, ... }
+    <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 eed66141053..b17926a4196 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/doNotInferFromBoundsOnly.lazy.log
@@ -33,14 +33,14 @@ 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@13['String']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@15
 }
@@ -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
 }
@@ -172,3 +172,191 @@ LazyJavaPackageFragment@70['lang'] {
     functions('foo': Name@106) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@98
     memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@98
 }
+
+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]
+    <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]
+    <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@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <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@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@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@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 }
+}
+
+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> = 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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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, ... }
+    <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 cc179f4769c..2e1a0cacf9a 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/intersectUpperBounds.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
 }
@@ -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
 }
@@ -158,3 +158,164 @@ LazyJavaPackageFragment@61['lang'] {
     functions('use': Name@95) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@92
 }
+
+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]
+    <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@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]
+    <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@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <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@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@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 }
+}
+
+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> = 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[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, ... }
+    <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 31eb7e3d5db..e9a65b85531 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@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@57['K'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['K']
+LazyJavaClassifierType@58['K'] {
+    arguments = ArrayList@59[empty]
+    classifier = JavaTypeParameterImpl@60['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@60['K'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['K']
+LazyJavaClassifierType@61['K'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@64['K'] {
     arguments = ArrayList@65[empty]
     classifier = JavaTypeParameterImpl@66['K']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@67['K'] {
     arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@56['K']
+    nullable = 'true': Boolean@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+}
+
+LazyJavaClassifierType@70['K'] {
+    arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@51['K']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@70['K'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@62['K']
-    nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
 LazyJavaClassifierType@72['K'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+    classifier = JavaTypeParameterImpl@60['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@74['K'] {
     arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@59['K']
+    classifier = JavaTypeParameterImpl@63['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@76['K'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@56['K']
+    classifier = JavaTypeParameterImpl@66['K']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@78['Map<? extends K, ? extends V>'] {
@@ -195,56 +195,56 @@ LazyJavaClassifierType@117['V'] {
     arguments = ArrayList@118[empty]
     classifier = JavaTypeParameterImpl@119['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@120['V'] {
     arguments = ArrayList@121[empty]
     classifier = JavaTypeParameterImpl@122['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@123['V'] {
     arguments = ArrayList@124[empty]
     classifier = JavaTypeParameterImpl@125['V']
     nullable = 'false': Boolean@52
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@126['V'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@115['V']
+    classifier = JavaTypeParameterImpl@122['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@119['V']
+    classifier = JavaTypeParameterImpl@115['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
 LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@122['V']
+    classifier = JavaTypeParameterImpl@119['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@132['V'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@125['V']
     nullable = 'true': Boolean@69
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaClassifierType@134['V'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@125['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@69
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
 }
 
 LazyJavaPackageFragmentProvider@136 {
@@ -310,48 +310,47 @@ LazyJavaPackageFragment@159['java'] {
 
 LazyJavaPackageFragment@163['lang'] {
     classes('HashMap': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('containsKey': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('defaultValue': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('get': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('defaultValue': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@197
     classes('getOrElse1': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('invoke': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('println': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('println': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@197
     deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@197
     functions('HashMap': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('containsKey': Name@198) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('defaultValue': Name@199) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('get': Name@200) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('defaultValue': Name@198) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
     functions('getOrElse1': Name@5) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('invoke': Name@201) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('println': Name@202) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@197
+    functions('println': Name@199) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@197
+    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
 LazyJavaPackageFragment@174['util'] {
-    classes('HashMap': Name@204) = LazyJavaClassDescriptor@10['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@205
-    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@205
-    functions('HashMap': Name@206) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@205
-    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@205
+    classes('HashMap': Name@201) = LazyJavaClassDescriptor@10['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@202
+    deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('HashMap': Name@203) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    memberIndex = computeMemberIndex$1@204 // through LazyPackageFragmentScopeForJavaPackage@202
 }
 
 LazyJavaTypeParameterDescriptor@31['K'] {
-    defaultType = JetTypeImpl@208['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    upperBounds = LinkedHashSet@209[1] { NullableType@210 }
+    defaultType = JetTypeImpl@205['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    upperBounds = LinkedHashSet@206[1] { NullableType@207 }
 }
 
 LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaTypeParameterDescriptor@32['V'] {
-    defaultType = JetTypeImpl@211['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
-    upperBounds = LinkedHashSet@212[1] { NullableType@213 }
+    defaultType = JetTypeImpl@208['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    upperBounds = LinkedHashSet@209[1] { NullableType@210 }
 }
 
 LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@112
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+}
+
+LazyJavaTypeParameterResolver@211 {
+    resolve(JavaTypeParameterImpl@212['K']) = LazyJavaTypeParameterDescriptor@26['K']
+    resolve(JavaTypeParameterImpl@213['V']) = LazyJavaTypeParameterDescriptor@27['V']
 }
 
 LazyJavaTypeParameterResolver@214 {
@@ -359,7 +358,76 @@ LazyJavaTypeParameterResolver@214 {
     resolve(JavaTypeParameterImpl@216['V']) = LazyJavaTypeParameterDescriptor@32['V']
 }
 
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@218['K']) = LazyJavaTypeParameterDescriptor@26['K']
-    resolve(JavaTypeParameterImpl@219['V']) = LazyJavaTypeParameterDescriptor@27['V']
+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]
+    <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]
+    <name not found> = EmptyList@6[empty]
+}
+
+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[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[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, ... }
+    <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 2a14134b6ee..34b89e5989e 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@18['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
 }
@@ -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
 }
@@ -151,3 +151,59 @@ LazyJavaPackageFragment@57['lang'] {
     functions('unescapeA': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
+
+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]
+    <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@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[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]
+    <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, ... }
+    <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 fdd61eec375..4b7fb69fb3a 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsIfUnknownParameters.lazy.log
@@ -45,3 +45,31 @@ LazyJavaPackageFragment@19['lang'] {
     functions('StringBase': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
+
+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]
+    <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@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
index 5f5b23881b6..a311d136f32 100644
--- a/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/upperBounds/useBoundsToInferTypeParamsSimple.lazy.log
@@ -63,3 +63,131 @@ LazyJavaPackageFragment@25['lang'] {
     functions('foo': Name@54) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@50
 }
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@47[empty]
+    <name not found> = EmptyList@47[empty]
+}
+
+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@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> = 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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log b/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
index 543e2f02018..0c4c1c5c3b0 100644
--- a/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/useFunctionLiteralsToInferType.lazy.log
@@ -117,63 +117,63 @@ LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
     classifier = JavaTypeParameterImpl@82['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
-LazyJavaClassifierType@83['E'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@85['E']
+LazyJavaClassifierType@84['E'] {
+    arguments = ArrayList@85[empty]
+    classifier = JavaTypeParameterImpl@86['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+LazyJavaClassifierType@87['E'] {
+    arguments = ArrayList@88[empty]
+    classifier = JavaTypeParameterImpl@89['E']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@71['E']
+    classifier = JavaTypeParameterImpl@86['E']
     nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@92['E'] {
     arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+    classifier = JavaTypeParameterImpl@75['E']
     nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
 LazyJavaClassifierType@94['E'] {
     arguments = ArrayList@95[empty]
+    classifier = JavaTypeParameterImpl@89['E']
+    nullable = 'true': Boolean@64
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+}
+
+LazyJavaClassifierType@96['E'] {
+    arguments = ArrayList@97[empty]
     classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@64
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@96['E'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@82['E']
-    nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
-}
-
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@85['E']
+    classifier = JavaTypeParameterImpl@82['E']
     nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
 }
 
 LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@75['E']
+    classifier = JavaTypeParameterImpl@71['E']
     nullable = 'true': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaClassifierType@102['Object'] {
@@ -225,21 +225,21 @@ LazyJavaClassifierType@121['String'] {
 
 LazyJavaClassifierType@124['String'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@123['String']
+    classifier = JavaClassImpl@116['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@126['String'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@116['String']
+    classifier = JavaClassImpl@120['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@117
 }
 
 LazyJavaClassifierType@128['String'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@120['String']
+    classifier = JavaClassImpl@123['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@117
 }
@@ -267,21 +267,21 @@ LazyJavaClassifierType@137['Throwable'] {
 
 LazyJavaClassifierType@140['Throwable'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@139['Throwable']
+    classifier = JavaClassImpl@136['Throwable']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@133
 }
 
 LazyJavaClassifierType@142['Throwable'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@132['Throwable']
+    classifier = JavaClassImpl@139['Throwable']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@133
 }
 
 LazyJavaClassifierType@144['Throwable'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@136['Throwable']
+    classifier = JavaClassImpl@132['Throwable']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@133
 }
@@ -353,47 +353,130 @@ LazyJavaPackageFragment@163['lang'] {
     classes('HashSet': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@204
     classes('Property': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@204
     classes('getOrPut': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    classes('minus': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@204
-    classes('toLong': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@204
     deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@204
     functions('Exception': Name@203) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
     functions('HashSet': Name@205) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
     functions('Property': Name@206) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
     functions('getOrPut': Name@207) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('minus': Name@208) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    functions('toLong': Name@209) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@204
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@204
+    memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@204
 }
 
 LazyJavaPackageFragment@172['util'] {
-    classes('HashSet': Name@211) = LazyJavaClassDescriptor@15['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('HashSet': Name@213) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('HashSet': Name@209) = LazyJavaClassDescriptor@15['HashSet'] // through LazyPackageFragmentScopeForJavaPackage@210
+    deserializedPackageScope = Empty@198 // through LazyPackageFragmentScopeForJavaPackage@210
+    functions('HashSet': Name@211) = EmptyList@200[empty] // through LazyPackageFragmentScopeForJavaPackage@210
+    memberIndex = computeMemberIndex$1@212 // through LazyPackageFragmentScopeForJavaPackage@210
 }
 
 LazyJavaTypeParameterDescriptor@38['E'] {
-    defaultType = JetTypeImpl@215['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
-    upperBounds = LinkedHashSet@216[1] { NullableType@217 }
+    defaultType = JetTypeImpl@213['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
+    upperBounds = LinkedHashSet@214[1] { NullableType@215 }
 }
 
 LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
 LazyJavaTypeParameterDescriptor@26['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
+}
+
+LazyJavaTypeParameterResolver@216 {
+    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@26['E']
+}
+
+LazyJavaTypeParameterResolver@217 {
+    resolve(JavaTypeParameterImpl@71['E']) = LazyJavaTypeParameterDescriptor@30['E']
 }
 
 LazyJavaTypeParameterResolver@218 {
-    resolve(JavaTypeParameterImpl@88['E']) = LazyJavaTypeParameterDescriptor@26['E']
+    resolve(JavaTypeParameterImpl@219['E']) = LazyJavaTypeParameterDescriptor@38['E']
 }
 
-LazyJavaTypeParameterResolver@219 {
-    resolve(JavaTypeParameterImpl@220['E']) = LazyJavaTypeParameterDescriptor@38['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]
 }
 
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@82['E']) = LazyJavaTypeParameterDescriptor@30['E']
+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]
+    <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]
+    <name not found> = EmptyList@200[empty]
+    <name not found> = EmptyList@200[empty]
+}
+
+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[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> = 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]
+}
+
+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]
+    <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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log b/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
index 67dae18d8af..e9c41a67906 100644
--- a/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
+++ b/compiler/testData/diagnostics/tests/inference/varargs/varargsAndPair.lazy.log
@@ -46,3 +46,26 @@ LazyJavaPackageFragment@11['lang'] {
     functions('foo': 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@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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
index 518a287ad11..6a80d022810 100644
--- a/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
+++ b/compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.lazy.log
@@ -31,31 +31,184 @@ LazyJavaPackageFragmentProvider@6 {
 LazyJavaPackageFragment@8['<root>'] {
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('c5': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('v5': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('v6': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('x': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('x': Name@36) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('v5': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('v6': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('x': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('x': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('c5': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('v5': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('v6': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('x': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('plus': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('x': Name@36) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('c5': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('v5': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('v6': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('x': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('x': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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]
+    <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]
+}
+
+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 }
+}
+
+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> = 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, ... }
+}
+
+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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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 ae0c58dee4c..44f16fa8594 100644
--- a/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
+++ b/compiler/testData/diagnostics/tests/infos/SmartCasts.lazy.log
@@ -45,46 +45,1686 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('c': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('compareTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('equals': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('foo': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('get': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('not': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('toString': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('bar': Name@44) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('c': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@46) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('foo': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('get': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('not': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('toString': Name@51) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('bar': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('c': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('compareTo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('lang': Name@54) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('bar': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('c': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('compareTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('equals': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('get': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('not': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('toString': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('bar': Name@44) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('c': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('compareTo': Name@46) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('equals': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('foo': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('get': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('not': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('toString': Name@51) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('bar': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('c': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('compareTo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('equals': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('bar': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('c': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('compareTo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('equals': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
+}
+
+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> = EmptyList@49[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@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 }
+    <name not found> = EmptyList@49[empty]
+    <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@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> = 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 }
+}
+
+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 }
+}
+
+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[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[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[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[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 }
+}
+
+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 }
+}
+
+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@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@412 {
+    <name not found> = ArrayList@413[1] { ResolutionCandidate@414 }
+    <name not found> = ArrayList@415[1] { ResolutionCandidate@414 }
+}
+
+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@424 {
+    <name not found> = ArrayList@425[1] { ResolutionCandidate@426 }
+    <name not found> = ArrayList@427[1] { ResolutionCandidate@426 }
+}
+
+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@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[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@460 {
+    <name not found> = ArrayList@461[1] { ResolutionCandidate@462 }
+    <name not found> = ArrayList@463[1] { ResolutionCandidate@462 }
+}
+
+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@472 {
+    <name not found> = ArrayList@473[1] { ResolutionCandidate@474 }
+    <name not found> = ArrayList@475[1] { ResolutionCandidate@474 }
+}
+
+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@484 {
+    <name not found> = ArrayList@485[1] { ResolutionCandidate@486 }
+    <name not found> = ArrayList@487[1] { ResolutionCandidate@486 }
+}
+
+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@496 {
+    <name not found> = ArrayList@497[1] { ResolutionCandidate@498 }
+    <name not found> = ArrayList@499[1] { ResolutionCandidate@498 }
+}
+
+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@508 {
+    <name not found> = ArrayList@509[1] { ResolutionCandidate@510 }
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@510 }
+}
+
+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@520 {
+    <name not found> = ArrayList@521[1] { ResolutionCandidate@522 }
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@522 }
+}
+
+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@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@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@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@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@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@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@580 {
+    <name not found> = ArrayList@581[1] { ResolutionCandidate@582 }
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@582 }
+}
+
+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@592 {
+    <name not found> = ArrayList@593[1] { ResolutionCandidate@594 }
+    <name not found> = ArrayList@595[1] { ResolutionCandidate@594 }
+}
+
+ResolutionTaskHolder@596 {
+    <name not found> = ArrayList@597[1] { ResolutionCandidate@598 }
+    <name not found> = ArrayList@599[1] { ResolutionCandidate@598 }
+}
+
+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[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]
+    <name not found> = EmptyList@49[empty]
+    <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@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]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@855 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@857 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@858 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@859 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@860 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@861 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@862 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@863 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@864 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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/anonymousObjects.lazy.log b/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
index 48a39ed0c04..f10e44ce860 100644
--- a/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/anonymousObjects.lazy.log
@@ -29,26 +29,51 @@ LazyJavaPackageFragmentProvider@8 {
 
 LazyJavaPackageFragment@10['<root>'] {
     classes('inline': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('p': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('invoke': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('p': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('p': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('p': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@14['java'] {
-    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
+    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('p': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('invoke': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('p': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('p': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('p': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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]
+    <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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/assignment.lazy.log b/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
index 5f365def491..e116eef7bff 100644
--- a/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/assignment.lazy.log
@@ -36,16 +36,56 @@ LazyJavaPackageFragment@9['<root>'] {
     classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('Unit': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('inline': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
-LazyJavaPackageFragment@17['lang'] {
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@40
+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> = 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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
index 17c1e8eda71..da9b0e5a86f 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/andOr.lazy.log
@@ -70,3 +70,72 @@ LazyJavaPackageFragment@23['lang'] {
     functions('invoke': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
+
+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@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> = 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 }
+}
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
index 83edf761bfe..de4be529514 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/arrayAccess.lazy.log
@@ -87,3 +87,79 @@ LazyJavaPackageFragment@29['lang'] {
     functions('get': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 }
+}
+
+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[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> = 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]
+    <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]
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
index 806837e743c..f68753e1967 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/assignment.lazy.log
@@ -95,3 +95,634 @@ LazyJavaPackageFragment@31['lang'] {
     functions('plusAssign': Name@54) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@62
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
+
+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]
+    <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@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]
+    <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]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <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]
+}
+
+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]
+    <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@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]
+    <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@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@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> = 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 }
+}
+
+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 }
+}
+
+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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+ResolutionTaskHolder@233 {
+    <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 db421a1d92f..aa4f8d1acf0 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/comparison.lazy.log
@@ -90,3 +90,327 @@ LazyJavaPackageFragment@30['lang'] {
     functions('compareTo': Name@57) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@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[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 }
+}
+
+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> = 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 }
+}
+
+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 }
+}
+
+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[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> = EmptyList@60[empty]
+    <name not found> = EmptyList@60[empty]
+    <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]
+    <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]
+    <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, ... }
+    <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@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]
+    <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]
+    <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]
+    <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, ... }
+    <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 27cca3bb50f..ad17df5eb0f 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/componentAccess.lazy.log
@@ -110,3 +110,125 @@ LazyJavaPackageFragment@36['lang'] {
     functions('component2': Name@64) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@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> = 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 }
+}
+
+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 {
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@113 }
+    <name not found> = ArrayList@114[1] { ResolutionCandidate@113 }
+}
+
+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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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, ... }
+    <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 60998397805..5a3b65d1ef3 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/contains.lazy.log
@@ -87,3 +87,239 @@ LazyJavaPackageFragment@29['lang'] {
     functions('contains': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 }
+}
+
+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[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> = 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[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 }
+}
+
+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[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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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, ... }
+    <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 1e216fc601b..cb23b7262be 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/mathOperations.lazy.log
@@ -88,3 +88,163 @@ LazyJavaPackageFragment@31['lang'] {
     functions('plus': Name@52) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 }
+}
+
+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[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> = 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[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> = 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]
+    <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]
+    <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]
+    <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]
+    <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]
+    <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 }
+    <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 c349a4f218c..8485999a98f 100644
--- a/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/binaryExpressions/rangeTo.lazy.log
@@ -91,3 +91,259 @@ LazyJavaPackageFragment@30['lang'] {
     functions('rangeTo': Name@64) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 }
+}
+
+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> = 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[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 }
+}
+
+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 }
+}
+
+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]
+    <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]
+    <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]
+    <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]
+    <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, ... }
+    <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@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]
+}
+
+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@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@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@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, ... }
+    <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 05f735eff02..2f0cd80e71c 100644
--- a/compiler/testData/diagnostics/tests/inline/capture.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/capture.lazy.log
@@ -70,37 +70,269 @@ LazyJavaPackageFragment@24['<root>'] {
     classes('inline': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
     classes('inlineExt': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@48
     classes('inlineExt2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('invoke': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('noInlineExt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('noinline': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('s': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('inlineExt': Name@52) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('inlineExt2': Name@53) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('invoke': Name@54) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('noInlineExt': Name@55) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('s': Name@57) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('noInlineExt': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('noinline': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('s': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('inlineExt': Name@52) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('inlineExt2': Name@53) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('noInlineExt': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('s': Name@56) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
 LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@63) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('lang': Name@62) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@32['lang'] {
-    classes('inlineExt': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('inlineExt2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('invoke': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('noInlineExt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('s': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('inlineExt': Name@52) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('inlineExt2': Name@53) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('invoke': Name@54) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('noInlineExt': Name@55) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('s': Name@57) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('inlineExt': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('inlineExt2': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('noInlineExt': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('s': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('inlineExt': Name@52) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('inlineExt2': Name@53) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('noInlineExt': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('s': Name@56) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
+}
+
+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]
+    <name not found> = EmptyList@58[empty]
+    <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]
+    <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@74 {
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+    <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@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]
+    <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]
+    <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@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]
+    <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@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@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[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 }
+}
+
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/constructor.lazy.log b/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
index b631ab7eff5..b861ce225a4 100644
--- a/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/constructor.lazy.log
@@ -42,3 +42,22 @@ LazyJavaPackageFragment@13['lang'] {
     functions('Z': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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@42 {
+    <name not found> = ArrayList@43[1] { ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@44 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/default.lazy.log b/compiler/testData/diagnostics/tests/inline/default.lazy.log
index 5ff7c378896..74b15eec3cf 100644
--- a/compiler/testData/diagnostics/tests/inline/default.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/default.lazy.log
@@ -53,3 +53,23 @@ LazyJavaPackageFragment@21['java'] {
     functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
 }
+
+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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
index 6947fc80dbf..1ea845d7f96 100644
--- a/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/extensionOnFunction.lazy.log
@@ -90,3 +90,149 @@ LazyJavaPackageFragment@29['lang'] {
     functions('noInlineExt': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
 }
+
+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]
+    <name not found> = EmptyList@54[empty]
+    <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]
+    <name not found> = EmptyList@54[empty]
+    <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@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <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]
+    <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@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@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@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> = 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[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log b/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
index 85e5e391dd1..da550f497b7 100644
--- a/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/fromInlineToNoInline.lazy.log
@@ -36,30 +36,67 @@ LazyJavaPackageFragmentProvider@10 {
 LazyJavaPackageFragment@12['<root>'] {
     classes('inline': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('inlineAll': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('noinline': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('p': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('inlineAll': Name@31) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('p': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('noinline': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('p': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('inlineAll': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('p': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('inlineAll': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('p': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('inlineAll': Name@31) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('invoke': Name@32) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('p': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('inlineAll': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('p': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('inlineAll': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('p': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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@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 }
+}
+
+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/functions.lazy.log b/compiler/testData/diagnostics/tests/inline/functions.lazy.log
index f36f8e6637a..9c3bcbcc33c 100644
--- a/compiler/testData/diagnostics/tests/inline/functions.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/functions.lazy.log
@@ -38,28 +38,115 @@ LazyJavaPackageFragment@9['<root>'] {
     classes('getFun': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('getInlineFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('inline': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('getFun': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('getInlineFun': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('getFun': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('getInlineFun': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('getFun': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('getInlineFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('getFun': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('getInlineFun': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('invoke': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('getFun': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('getInlineFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('getFun': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('getInlineFun': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+}
+
+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]
+    <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 }
+    <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@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@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 }
+}
+
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/invoke.lazy.log b/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
index 73688941619..0dfa46e41ef 100644
--- a/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/invoke.lazy.log
@@ -78,3 +78,227 @@ LazyJavaPackageFragment@23['lang'] {
     functions('s': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
 }
+
+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]
+    <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@60 {
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[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]
+    <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@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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@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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@48[empty]
+}
+
+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@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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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[1] { ResolutionCandidate@182 }
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@182 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/labeled.lazy.log b/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
index ec478fdcea0..41e88d409d3 100644
--- a/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/labeled.lazy.log
@@ -34,28 +34,129 @@ LazyJavaPackageFragment@9['<root>'] {
     classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('inline': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar1': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('bar2': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('bar1': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('bar2': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@16['lang'] {
-    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('bar1': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('bar2': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('bar1': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('bar2': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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]
+    <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]
+}
+
+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@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 }
+}
+
+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> = 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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
index d06ce40265b..3fc52e92aad 100644
--- a/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/localFun.lazy.log
@@ -34,3 +34,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+ResolutionTaskHolder@33 {
+    <name not found> = ArrayList@34[1] { ResolutionCandidate@35 }
+    <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 9205969734b..a92ad92ec2c 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjects.lazy.log
@@ -55,28 +55,94 @@ LazyJavaPackageFragment@22['<root>'] {
     classes('ONLY_LOCAL_RETURN': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('inline': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('inlineOptions': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('kotlin': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('invoke': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('kotlin': Name@49) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('p': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('kotlin': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('kotlin': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('p': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('lang': Name@53) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('lang': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
 LazyJavaPackageFragment@29['lang'] {
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('invoke': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('p': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('p': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
+}
+
+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]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <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]
+}
+
+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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
index 8b83f4b0e6c..23e20c3233d 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/anonymousObjectsNested.lazy.log
@@ -62,31 +62,246 @@ LazyJavaPackageFragment@25['<root>'] {
     classes('doCall': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('inline': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
     classes('inlineOptions': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('invoke': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('kotlin': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    classes('p': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('doCall': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('invoke': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('kotlin': Name@53) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('p': Name@50) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('kotlin': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('doCall': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('kotlin': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('p': Name@49) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('lang': Name@57) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('lang': Name@56) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@32['lang'] {
-    classes('doCall': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('invoke': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('p': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('doCall': Name@45) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('invoke': Name@48) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('p': Name@50) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('doCall': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('doCall': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('p': Name@49) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+}
+
+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]
+    <name not found> = EmptyList@51[empty]
+    <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@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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@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]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+}
+
+ResolutionTaskHolder@92 {
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@94 }
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@94 }
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
index 4951d03f747..6b617652a6a 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/explicitReturnType.lazy.log
@@ -27,33 +27,85 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('inline': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('noInline': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('s': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('inlineFun': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('noInline': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('s': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['java'] {
-    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
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('noInline': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('s': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('inlineFun': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('invoke': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('noInline': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('s': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+    <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]
+    <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]
+    <name not found> = EmptyList@31[empty]
+}
+
+ResolutionTaskHolder@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@57 }
+    <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 c73a19843f1..cdad5d69fbd 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/fromOnlyLocal.lazy.log
@@ -40,31 +40,75 @@ LazyJavaPackageFragment@14['<root>'] {
     classes('inline': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inlineAll': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inlineOptions': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('inlineAll': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('kotlin': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('inlineAll': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('kotlin': Name@41) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    classes('inlineAll': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('p': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('inlineAll': Name@35) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('invoke': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('p': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('inlineAll': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('inlineAll': Name@35) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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@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]
+}
+
+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 }
+}
+
+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/inline/nonLocalReturns/inlineLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
index d5de905e822..bc3f05caf63 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/inlineLambda.lazy.log
@@ -46,31 +46,108 @@ LazyJavaPackageFragment@17['<root>'] {
     classes('inline': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('inlineFun': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('inlineOptions': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('kotlin': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('p': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inlineFun': Name@38) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@40) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('kotlin': Name@45) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('p': Name@42) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('kotlin': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('inlineFun': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('kotlin': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('p': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('lang': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
 LazyJavaPackageFragment@24['lang'] {
-    classes('inlineFun': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('p': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('inlineFun': Name@38) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('invoke': Name@40) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('p': Name@42) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('inlineFun': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('inlineFun': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('p': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
+}
+
+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]
+    <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@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]
+    <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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
index 4951d03f747..60a86a3f17b 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/labeledReturn.lazy.log
@@ -27,33 +27,76 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('inline': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('noInline': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('s': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('inlineFun': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('noInline': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('s': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['java'] {
-    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
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('noInline': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('s': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('inlineFun': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('invoke': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('noInline': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('s': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('inlineFun': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('noInline': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('s': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('inlineFun': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('noInline': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('s': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+    <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@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@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 fcfe5ded1cb..bc492f5a8eb 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/lambdaWithGlobalReturnsInsideOnlyLocalOne.lazy.log
@@ -48,35 +48,86 @@ LazyJavaPackageFragment@14['<root>'] {
     classes('doWork': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('inline': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('inlineOptions': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('job': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('kotlin': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('lambdaWithResultCaptured': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('doWork': Name@42) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('invoke': Name@45) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('job': Name@46) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('kotlin': Name@51) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('lambdaWithResultCaptured': Name@48) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('job': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('kotlin': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('lambdaWithResultCaptured': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('doWork': Name@42) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('job': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('kotlin': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('lambdaWithResultCaptured': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('lang': Name@55) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('lang': Name@54) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
 LazyJavaPackageFragment@23['lang'] {
-    classes('doWork': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('job': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('lambdaWithResultCaptured': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('doWork': Name@42) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('invoke': Name@45) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('job': Name@46) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lambdaWithResultCaptured': Name@48) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('doWork': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('job': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('lambdaWithResultCaptured': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('doWork': Name@42) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('job': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('lambdaWithResultCaptured': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
+}
+
+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]
+    <name not found> = EmptyList@49[empty]
+}
+
+ResolutionTaskHolder@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <name not found> = EmptyList@49[empty]
+    <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@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 }
+}
+
+ResolutionTaskHolder@90 {
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@92 }
+    <name not found> = ArrayList@93[1] { ResolutionCandidate@92 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
index 8a6de793c3d..f0d3b82d65e 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/localFun.lazy.log
@@ -40,31 +40,83 @@ LazyJavaPackageFragment@14['<root>'] {
     classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inline': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inlineOptions': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('a': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('kotlin': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('a': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('kotlin': Name@41) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('p': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('a': Name@34) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('invoke': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('p': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('a': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('a': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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]
+    <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]
+}
+
+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 }
+}
+
+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/inline/nonLocalReturns/nestedNonLocals.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
index b65d341ec4c..b87667d978a 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nestedNonLocals.lazy.log
@@ -44,47 +44,240 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('block': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('doCall': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('equals': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inline': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('External': Name@37) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Global': Name@39) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Internal': Name@40) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Kind': Name@41) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('block': Name@43) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('doCall': Name@44) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@45) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@47) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@48) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('inline': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('External': Name@37) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Global': Name@39) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Internal': Name@40) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Kind': Name@41) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('block': Name@43) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('doCall': Name@44) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('lang': Name@51) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('External': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Global': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Internal': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('block': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('doCall': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('equals': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('invoke': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('plus': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@49 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('External': Name@37) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('Global': Name@39) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('Internal': Name@40) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('block': Name@43) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('doCall': Name@44) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('equals': Name@45) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('invoke': Name@47) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('plus': Name@48) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('External': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('Global': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('Internal': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('block': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('doCall': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('External': Name@37) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('Global': Name@39) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('Internal': Name@40) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('block': Name@43) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('doCall': Name@44) = EmptyList@47[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
+}
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <name not found> = EmptyList@47[empty]
+}
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <name not found> = EmptyList@47[empty]
+    <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@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@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@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 }
+}
+
+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 }
+}
+
+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@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 15fa1bdceda..516f139a43f 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineAnnotation.lazy.log
@@ -38,31 +38,58 @@ LazyJavaPackageFragment@9['<root>'] {
     classes('String': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('Unit': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('lambda': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('noinline': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('test': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lambda': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('test': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lambda': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('noinline': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('test': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('lambda': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('test': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('lambda': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('test': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('invoke': Name@37) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lambda': Name@38) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('test': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lambda': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('test': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('lambda': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('test': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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]
+    <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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
index bde3f375873..18f19f5a6c6 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/noInlineLambda.lazy.log
@@ -39,28 +39,80 @@ LazyJavaPackageFragment@14['<root>'] {
     classes('ONLY_LOCAL_RETURN': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inline': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inlineOptions': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@36) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@41) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('kotlin': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('kotlin': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('p': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@43
+    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('invoke': Name@36) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('p': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+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]
+    <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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
index b0ee649e71b..2a940e90a2a 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/nonInlinedClass.lazy.log
@@ -47,28 +47,94 @@ LazyJavaPackageFragment@18['<root>'] {
     classes('ONLY_LOCAL_RETURN': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('inline': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
     classes('inlineOptions': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('kotlin': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('p': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('invoke': Name@40) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('kotlin': Name@45) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('p': Name@42) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('kotlin': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('kotlin': Name@43) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('p': Name@41) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('lang': Name@48) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('p': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('invoke': Name@40) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('p': Name@42) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('p': Name@41) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
+}
+
+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]
+    <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]
+}
+
+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@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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
index e56bd1feb89..bba4db2b0d1 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambda.lazy.log
@@ -34,31 +34,158 @@ LazyJavaPackageFragment@11['<root>'] {
     classes('inline': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('inlineFun': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('inlineOptions': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('invoke': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('kotlin': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('inlineFun': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('invoke': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('kotlin': Name@39) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('p': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('kotlin': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('p': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('inlineFun': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('kotlin': Name@38) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('p': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('lang': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('inlineFun': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('inlineFun': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('inlineFun': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('inlineFun': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('p': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+}
+
+ResolutionTaskHolder@78 {
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@80 }
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@80 }
+    <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> = 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@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@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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
index a666d207b9b..41e5d9494f7 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/onlyLocalReturnLambdaBinaryExpr.lazy.log
@@ -34,36 +34,129 @@ LazyJavaPackageFragment@11['<root>'] {
     classes('ONLY_LOCAL_RETURN': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('Z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@31
     classes('inline': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('inlineFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('inlineOptions': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('kotlin': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('Z': Name@32) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('inlineFun': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('invoke': Name@36) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('kotlin': Name@41) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('inlineOptions': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('kotlin': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('Z': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('kotlin': Name@39) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('p': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@17['java'] {
-    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('lang': Name@45) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('lang': Name@43) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
 }
 
 LazyJavaPackageFragment@19['lang'] {
-    classes('Z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('inlineFun': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('Z': Name@32) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('inlineFun': Name@34) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('invoke': Name@36) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('p': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('Z': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('Z': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('p': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+}
+
+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]
+    <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 }
+    <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@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@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]
+}
+
+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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
index ab518ec7db8..25decc841bc 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/propertyAccessorsAndConstructor.lazy.log
@@ -31,41 +31,159 @@ LazyJavaPackageFragmentProvider@7 {
 
 LazyJavaPackageFragment@9['<root>'] {
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('div': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('doCall': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('doCallInt': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('inline': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('p': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('result': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('div': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('doCall': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('doCallInt': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('p': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('doCall': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('doCallInt': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('inline': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('p': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('result': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('doCall': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('doCallInt': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('p': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('div': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('doCall': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('doCallInt': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('invoke': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('p': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('result': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('div': Name@29) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('doCall': Name@30) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('doCallInt': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('invoke': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('p': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('doCall': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('doCallInt': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('p': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('result': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('doCall': Name@29) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('doCallInt': Name@30) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('p': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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]
+    <name not found> = EmptyList@35[empty]
+    <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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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> = 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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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]
+    <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@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@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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
index b4d2885c4d9..24a839e0976 100644
--- a/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonLocalReturns/toOnlyLocal.lazy.log
@@ -39,32 +39,76 @@ LazyJavaPackageFragment@14['<root>'] {
     classes('ONLY_LOCAL_RETURN': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inline': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inlineOptions': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('kotlin': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('toOnlyLocal': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('kotlin': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('p': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('toOnlyLocal': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('kotlin': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('toOnlyLocal': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('kotlin': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('p': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('toOnlyLocal': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@19['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@21['lang'] {
-    classes('invoke': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('p': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('toOnlyLocal': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('invoke': Name@36) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('p': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('toOnlyLocal': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('p': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('toOnlyLocal': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('p': Name@37) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('toOnlyLocal': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@41[empty]
+}
+
+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 }
+}
+
+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/inline/nonPublicMember/inNonPublicClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
index 7d1a171cdfb..6f47dafaf46 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicClass.lazy.log
@@ -84,3 +84,351 @@ LazyJavaPackageFragment@28['lang'] {
     functions('publicFun': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
+
+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]
+    <name not found> = EmptyList@46[empty]
+    <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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@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]
+    <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 }
+    <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@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@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@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]
+    <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]
+    <name not found> = EmptyList@46[empty]
+    <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@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@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@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 }
+}
+
+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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
index d6bf332098d..4c241fbc235 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inNonPublicInnerClass.lazy.log
@@ -66,3 +66,541 @@ LazyJavaPackageFragment@20['lang'] {
     functions('publicFun': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
 }
+
+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> = 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 }
+    <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> = 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 }
+    <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> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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> = 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 }
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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 }
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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@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@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@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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
index 45d157f15ed..a13bce2703c 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPackage.lazy.log
@@ -72,3 +72,87 @@ LazyJavaPackageFragment@25['lang'] {
     functions('privateFun': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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]
+    <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 }
+    <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@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]
+    <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]
+}
+
+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]
+}
+
+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 8f9d6c9257a..94ab65f6e1d 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/inPublicClass.lazy.log
@@ -70,3 +70,111 @@ LazyJavaPackageFragment@26['lang'] {
     functions('privateFun': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
 }
+
+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]
+    <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]
+    <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]
+    <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@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@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 }
+}
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
index 347227a94aa..21220a5cf4c 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass.lazy.log
@@ -39,3 +39,23 @@ LazyJavaPackageFragment@15['lang'] {
     classes('privateProperty': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@30
     deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
index 00ce2ebbed2..85d32f27016 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localClass2.lazy.log
@@ -19,25 +19,40 @@ LazyJavaPackageFragmentProvider@4 {
 LazyJavaPackageFragment@6['<root>'] {
     classes('Z': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('inline': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('localFun': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('Z': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('localFun': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('Z': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Z': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('localFun': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('Z': Name@17) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('localFun': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('Z': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Z': Name@17) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
index e11df7a505f..abfc4587462 100644
--- a/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonPublicMember/localFun.lazy.log
@@ -37,3 +37,13 @@ LazyJavaPackageFragment@11['lang'] {
     functions('localFun': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log b/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
index f8aeea834c7..eef62e07a75 100644
--- a/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nonVirtualMembersWithInline.lazy.log
@@ -166,3 +166,123 @@ LazyJavaPackageFragment@80['java'] {
     functions('lang': Name@93) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@91
     memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log b/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
index 0916fa66bd8..62f4a5dcda7 100644
--- a/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nothingToInline.lazy.log
@@ -84,3 +84,48 @@ LazyJavaPackageFragment@35['java'] {
     functions('lang': Name@58) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@56
 }
+
+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 }
+}
+
+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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log b/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
index 6eaae183567..d0638bc895e 100644
--- a/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nullabilityOperations.lazy.log
@@ -42,26 +42,103 @@ LazyJavaPackageFragment@12['<root>'] {
     classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('String': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('submit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('submit': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('submit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('submit': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('lang': Name@44) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
 }
 
 LazyJavaPackageFragment@20['lang'] {
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('submit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('invoke': Name@37) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('submit': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('submit': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('submit': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+}
+
+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> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@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 }
+}
+
+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> = 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> = 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 }
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log b/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
index 7799becc711..4983d345cf6 100644
--- a/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/nullableFunction.lazy.log
@@ -61,23 +61,67 @@ LazyJavaPackageFragment@21['<root>'] {
     classes('Function1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('Int': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
     classes('inline': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('noinline': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('noinline': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
 LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('lang': Name@55) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('lang': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@51 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('lang': Name@52) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
-LazyJavaPackageFragment@29['lang'] {
-    classes('invoke': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('invoke': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
+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 }
+}
+
+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> = 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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log b/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
index 7f2af02d8a3..619fc9a01a6 100644
--- a/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/parenthesized.lazy.log
@@ -49,25 +49,154 @@ LazyJavaPackageFragment@15['<root>'] {
     classes('Unit': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('inline': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('inlineFunWithInvoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inlineFunWithInvoke': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('inlineFunWithInvoke': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@21['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@46) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
 LazyJavaPackageFragment@23['lang'] {
-    classes('inlineFunWithInvoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('invoke': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('inlineFunWithInvoke': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('invoke': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('inlineFunWithInvoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('inlineFunWithInvoke': Name@40) = EmptyList@42[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+}
+
+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]
+    <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@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> = 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 }
+}
+
+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[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> = 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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/propagation.lazy.log b/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
index a24ed03cfab..f8ccda13820 100644
--- a/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/propagation.lazy.log
@@ -125,3 +125,580 @@ LazyJavaPackageFragment@44['lang'] {
     functions('subNoInline': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
 }
+
+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> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+}
+
+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@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <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]
+    <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 }
+    <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 }
+    <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 }
+    <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@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]
+    <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> = 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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <name not found> = EmptyList@71[empty]
+    <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]
+    <name not found> = EmptyList@71[empty]
+    <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@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]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@71[empty]
+    <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]
+    <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@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@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@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@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@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@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[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[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[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@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@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@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@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[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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/recursion.lazy.log b/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
index c77613cd77f..e68af97e0ad 100644
--- a/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/recursion.lazy.log
@@ -99,3 +99,95 @@ LazyJavaPackageFragment@30['lang'] {
     functions('not': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
 }
+
+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]
+    <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 }
+    <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@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@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[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> = 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]
+    <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 }
+    <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 58f2ea31cd7..dedb68dafa5 100644
--- a/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/regressions/kt4341.lazy.log
@@ -33,9 +33,22 @@ LazyJavaPackageFragment@15['java'] {
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@17['lang'] {
-    classes('equals': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('equals': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/returns.lazy.log b/compiler/testData/diagnostics/tests/inline/returns.lazy.log
index d228cc8529a..6bd10648258 100644
--- a/compiler/testData/diagnostics/tests/inline/returns.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/returns.lazy.log
@@ -68,3 +68,53 @@ LazyJavaPackageFragment@27['java'] {
     functions('lang': Name@49) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@47
 }
+
+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 }
+}
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/sam.lazy.log b/compiler/testData/diagnostics/tests/inline/sam.lazy.log
index 13b4a89389f..3b826e9f359 100644
--- a/compiler/testData/diagnostics/tests/inline/sam.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/sam.lazy.log
@@ -142,3 +142,338 @@ LazyJavaPackageFragment@59['lang'] {
     functions('test': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@91
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
 }
+
+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]
+    <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 }
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <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@115 {
+    <name not found> = ArrayList@116[1] { ResolutionCandidate@117 }
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@117 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+    <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 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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@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@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> = 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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/typed.lazy.log b/compiler/testData/diagnostics/tests/inline/typed.lazy.log
index a6369449cf2..34f7f08a03d 100644
--- a/compiler/testData/diagnostics/tests/inline/typed.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/typed.lazy.log
@@ -42,22 +42,121 @@ LazyJavaPackageFragment@12['<root>'] {
     classes('Int': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('Unit': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@33
     classes('inline': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@33
 }
 
 LazyJavaPackageFragment@18['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
-LazyJavaPackageFragment@20['lang'] {
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+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> = 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 }
+}
+
+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> = 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> = 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 }
+}
+
+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 {
+    <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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
index 377be664264..39be54a8563 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/mathOperation.lazy.log
@@ -102,3 +102,267 @@ LazyJavaPackageFragment@37['lang'] {
     functions('plus': Name@58) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@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[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 }
+}
+
+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> = 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 }
+}
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <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 }
+    <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@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]
+    <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]
+    <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]
+    <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 }
+    <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]
+    <name not found> = EmptyList@60[empty]
+    <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 f5efccc75ea..42ba573c055 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOnCall.lazy.log
@@ -26,30 +26,44 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('Boolean': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('Char': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('inline': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('not': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('predicate': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('not': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('predicate': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('predicate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('predicate': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('not': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('predicate': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('invoke': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('not': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('predicate': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('predicate': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('predicate': 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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
index d0ce2e65580..c0ff43b1e8c 100644
--- a/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unaryExpressions/notOperation.lazy.log
@@ -87,3 +87,123 @@ LazyJavaPackageFragment@29['lang'] {
     functions('not': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 }
+}
+
+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[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> = 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, ... }
+    <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@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]
+    <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]
+    <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]
+    <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, ... }
+    <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 5f685686658..4f778ee8fd7 100644
--- a/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/unsupportedConstruction.lazy.log
@@ -50,3 +50,23 @@ LazyJavaPackageFragment@19['java'] {
     functions('lang': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
 }
+
+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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/vararg.lazy.log b/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
index a9dc336b4a2..cefd91e6c10 100644
--- a/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/vararg.lazy.log
@@ -79,3 +79,128 @@ LazyJavaPackageFragment@26['lang'] {
     functions('subNoInline': Name@48) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
+
+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]
+    <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@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]
+    <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@66 {
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@68 }
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@68 }
+    <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@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@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 }
+}
+
+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[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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log b/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
index 2043628e535..f89b7f55f19 100644
--- a/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
+++ b/compiler/testData/diagnostics/tests/inline/wrongUsage.lazy.log
@@ -69,23 +69,242 @@ LazyJavaPackageFragment@27['<root>'] {
     classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
     classes('Unit': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@48
     classes('inline': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('invoke': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('noinline': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('invoke': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('noinline': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
 LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('lang': Name@58) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('lang': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
-LazyJavaPackageFragment@34['lang'] {
-    classes('invoke': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@53 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('invoke': Name@51) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
+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 }
+}
+
+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 }
+}
+
+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[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> = 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[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 }
+}
+
+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 }
+}
+
+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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
index 67aea732b6d..568eff96ac6 100644
--- a/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/classesInClassObjectHeader.lazy.log
@@ -33,3 +33,26 @@ LazyJavaPackageFragment@14['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log b/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
index 6ca0c8dd99b..d3b4dd586ce 100644
--- a/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/constructorAccess.lazy.log
@@ -52,3 +52,623 @@ LazyJavaPackageFragment@15['lang'] {
     functions('Outer2': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@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@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <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 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 }
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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 c9ab4511137..a2f172bed28 100644
--- a/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/enumEntries.lazy.log
@@ -22,30 +22,91 @@ LazyJavaPackageFragmentProvider@4 {
 
 LazyJavaPackageFragment@6['<root>'] {
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('outerFun': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('plus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('foo': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('outerFun': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('plus': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('outerFun': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('outerFun': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('outerFun': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('plus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('outerFun': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('plus': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('outerFun': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('outerFun': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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> = 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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 {
+    <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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log b/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
index 3cd36d3e7b8..c6ee78ae7e3 100644
--- a/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/extensionFun.lazy.log
@@ -44,3 +44,401 @@ LazyJavaPackageFragment@9['lang'] {
     functions('Outer': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = ArrayList@43[1] { ResolutionCandidate@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 {
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <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 }
+    <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 bc586d02024..bd005bf501a 100644
--- a/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/extensionLambdaInsideNestedClass.lazy.log
@@ -38,9 +38,57 @@ LazyJavaPackageFragment@17['java'] {
 }
 
 LazyJavaPackageFragment@19['lang'] {
-    classes('get': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('session': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('session': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
     deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('get': Name@39) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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]
+    <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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
index 2fc374ae934..98cc3cdf9be 100644
--- a/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/innerErrorForClassObjects.lazy.log
@@ -55,3 +55,338 @@ LazyJavaPackageFragment@17['lang'] {
     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@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> = 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@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@77 {
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@79 }
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@79 }
+    <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 2fc374ae934..799d9b3a627 100644
--- a/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/innerErrorForObjects.lazy.log
@@ -55,3 +55,538 @@ LazyJavaPackageFragment@17['lang'] {
     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@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> = 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> = 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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <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 }
+    <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@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log b/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
index 3dd87004fe3..914718150e7 100644
--- a/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/innerThisSuper.lazy.log
@@ -23,23 +23,39 @@ LazyJavaPackageFragmentProvider@6 {
     packageFragments('kotlin.jvm': FqName@19) = null
 }
 
-LazyJavaPackageFragment@8['<root>'] {
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('bar': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
-LazyJavaPackageFragment@14['lang'] {
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+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@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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log b/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
index 954821cb46b..97cc27d3d9f 100644
--- a/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/kt5854.lazy.log
@@ -28,3 +28,66 @@ LazyJavaPackageFragment@7['lang'] {
     functions('Nested': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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> = 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]
+    <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]
+    <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 11052003677..489c3a019a1 100644
--- a/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/kt6026.lazy.log
@@ -41,3 +41,66 @@ LazyJavaPackageFragment@12['lang'] {
     functions('Nested': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 d75b54bf121..c53e0e05b45 100644
--- a/compiler/testData/diagnostics/tests/inner/localClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/localClass.lazy.log
@@ -28,29 +28,129 @@ LazyJavaPackageFragmentProvider@7 {
 LazyJavaPackageFragment@9['<root>'] {
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('Local': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('compareTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('localState': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('outerState': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Local': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('compareTo': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('localState': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('outerState': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Local': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('Local': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('compareTo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('localState': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('outerState': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('Local': Name@23) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('compareTo': Name@24) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('Local': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('localState': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('outerState': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('Local': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@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> = 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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 }
+    <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@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <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]
+    <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@79 {
+    <name not found> = ArrayList@80[1] { ResolutionCandidate@81 }
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@81 }
+    <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 afa3396ea41..5b4729789eb 100644
--- a/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/localClassInsideNested.lazy.log
@@ -34,3 +34,106 @@ LazyJavaPackageFragment@12['lang'] {
     classes('outerState': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
     deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@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> = 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> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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 b15e6bcd401..06f8b759ef3 100644
--- a/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/localThisSuper.lazy.log
@@ -27,23 +27,29 @@ LazyJavaPackageFragmentProvider@5 {
     packageFragments('kotlin.jvm': FqName@18) = null
 }
 
-LazyJavaPackageFragment@7['<root>'] {
-    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@13['lang'] {
-    classes('bar': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/modality.lazy.log b/compiler/testData/diagnostics/tests/inner/modality.lazy.log
index 56f97a7d8b7..9c7c5e1ffb4 100644
--- a/compiler/testData/diagnostics/tests/inner/modality.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/modality.lazy.log
@@ -26,3 +26,46 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@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@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/inner/nestedClassAccessedViaInstanceReference.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
index f815dbb8853..7b419d27627 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassAccessedViaInstanceReference.lazy.log
@@ -30,35 +30,871 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('NestedObj': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('NestedWithClassObject': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('Nested': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('NestedObj': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('NestedWithClassObject': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('invoke': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Nested': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('NestedObj': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('NestedWithClassObject': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('invoke': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('NestedObj': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('NestedWithClassObject': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('foo': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('Nested': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('NestedObj': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('NestedWithClassObject': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('foo': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('invoke': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('Nested': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('NestedObj': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('NestedWithClassObject': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('invoke': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Nested': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('NestedObj': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('NestedWithClassObject': 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
+}
+
+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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 }
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 }
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <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@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@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@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@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@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@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> = 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[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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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 {
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 6044b8f9062..c0ad6ac8c0c 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuter.lazy.log
@@ -36,3 +36,22 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
index 6146714180f..1d9337d15f8 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedClassExtendsOuterGeneric.lazy.log
@@ -40,3 +40,46 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
index 9ba337ec47f..23a7cb9a54e 100644
--- a/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/nestedVsInnerAccessOuterMember.lazy.log
@@ -56,3 +56,305 @@ LazyJavaPackageFragment@15['lang'] {
     functions('innerFun': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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@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@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> = 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 }
+    <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> = EmptyList@25[empty]
+    <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> = 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@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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@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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log b/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
index f59f8ba6d27..dcb4dd6b1a8 100644
--- a/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/outerGenericParam.lazy.log
@@ -17,17 +17,24 @@ LazyJavaPackageFragmentProvider@4 {
     packageFragments('kotlin.jvm': FqName@17) = null
 }
 
-LazyJavaPackageFragment@6['<root>'] {
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@19
-}
-
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
+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@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@34 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log b/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
index b5cb7020dab..58a7beadfd2 100644
--- a/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/outerProtectedMember.lazy.log
@@ -21,16 +21,16 @@ LazyJavaPackageFragmentProvider@3 {
 
 LazyJavaPackageFragment@5['<root>'] {
     classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <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 f7bcc2bc756..1003d1ab094 100644
--- a/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/outerSuperClassMember.lazy.log
@@ -35,3 +35,131 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@16) = 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> = 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> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
index 17cb430922f..ef97031aed3 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/classObjectOfNestedClass.lazy.log
@@ -18,26 +18,63 @@ LazyJavaPackageFragmentProvider@2 {
 }
 
 LazyJavaPackageFragment@4['<root>'] {
-    classes('bar': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('bar': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@18
+    functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@18
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('bar': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('bar': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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]
+    <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 }
+    <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]
+}
+
+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]
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
index b369ece4b5a..567e5c95db2 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/constructNestedClass.lazy.log
@@ -21,30 +21,224 @@ LazyJavaPackageFragmentProvider@8 {
 }
 
 LazyJavaPackageFragment@10['<root>'] {
-    classes('Inner': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('InnerInner': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('Outer': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Inner': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('InnerInner': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('Outer': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('Outer': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('Outer': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@15['lang'] {
-    classes('Inner': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('InnerInner': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('Outer': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('Inner': Name@21) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('InnerInner': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('Outer': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('Outer': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('Outer': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+    <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 }
+    <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 {
+    <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@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 }
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+}
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+}
+
+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]
+}
+
+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 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 6e2a36f36a4..ac09bd4fe02 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/dataLocalVariable.lazy.log
@@ -25,25 +25,45 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('List': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('contains': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('bar': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('contains': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('bar': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('contains': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('bar': Name@25) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('contains': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('bar': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('bar': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
index 32439f3db27..726b2ef27a5 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/enumConstant.lazy.log
@@ -29,3 +29,43 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 ecd2c56a9b1..89f19b4272d 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/genericNestedClass.lazy.log
@@ -38,3 +38,105 @@ LazyJavaPackageFragment@11['java'] {
 LazyJavaPackageFragment@13['lang'] {
     deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = 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]
+    <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 }
+    <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]
+}
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+}
+
+ResolutionTaskHolder@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]
+}
+
+ResolutionTaskHolder@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]
+}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
index b4a512fd879..d39bbe31965 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/importNestedClass.lazy.log
@@ -56,3 +56,109 @@ LazyJavaPackageFragment@18['lang'] {
     functions('C': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
 }
+
+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]
+    <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]
+    <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@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]
+    <name not found> = EmptyList@31[empty]
+    <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]
+}
+
+ResolutionTaskHolder@69 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 78fa11c7e81..0bfe2e544ee 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedClassInPackage.lazy.log
@@ -26,3 +26,38 @@ LazyJavaPackageFragment@12['lang'] {
     classes('A': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+}
+
+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]
+    <name not found> = EmptyList@20[empty]
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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/nestedEnumConstant.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
index 05ed0d5a174..0b6eb2d0d2e 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedEnumConstant.lazy.log
@@ -29,3 +29,69 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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/nestedObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
index 7afd99fa38c..086f43d7ad3 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/nestedObjects.lazy.log
@@ -29,3 +29,24 @@ LazyJavaPackageFragment@8['java'] {
 LazyJavaPackageFragment@10['lang'] {
     deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+    <name not found> = EmptyList@21[empty]
+}
+
+ResolutionTaskHolder@32 {
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
index c269b2a22f6..0262646c0fd 100644
--- a/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/qualifiedExpression/typePosition.lazy.log
@@ -20,3 +20,13 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log b/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
index 40a3b70f343..3c63ccfe2a7 100644
--- a/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/referenceToSelfInLocal.lazy.log
@@ -38,3 +38,80 @@ LazyJavaPackageFragment@11['lang'] {
     functions('MyClass': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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> = 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]
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
index 73dec0c5b88..d69633aea18 100644
--- a/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/resolvePackageClassInObjects.lazy.log
@@ -17,3 +17,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
     memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
index 45c9f623f0c..815350860c8 100644
--- a/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/selfAnnotationForClassObject.lazy.log
@@ -38,3 +38,13 @@ LazyJavaPackageFragment@13['java'] {
 LazyJavaPackageFragment@15['lang'] {
     classes('ClassObjectAnnotation': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/inner/visibility.lazy.log b/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
index 8c5780e5830..acd19533feb 100644
--- a/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/inner/visibility.lazy.log
@@ -15,31 +15,417 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Outer': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
     classes('PrivateInner': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
     classes('ProtectedInner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('PublicInner': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('Outer': Name@14) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('PrivateInner': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('ProtectedInner': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('PublicInner': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@15
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('Outer': Name@14) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('PrivateInner': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('ProtectedInner': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@15
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('Outer': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PrivateInner': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('ProtectedInner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('PublicInner': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Outer': Name@14) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PrivateInner': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('ProtectedInner': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('PublicInner': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('Outer': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('PrivateInner': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('ProtectedInner': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('Outer': Name@14) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('PrivateInner': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('ProtectedInner': 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> = 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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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@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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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@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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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> = 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]
+    <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@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]
+    <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 }
+    <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@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@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@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> = 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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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@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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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@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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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@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 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 76c352d35d1..a851cc809ab 100644
--- a/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/GenericsInSupertypes.lazy.log
@@ -473,7 +473,7 @@ LazyJavaClassifierType@450['Collection<? extends E>'] {
 
 LazyJavaClassifierType@455['Collection<? extends E>'] {
     arguments = ArrayList@456[1] { TypeProjectionImpl@457 }
-    classifier = JavaClassImpl@453['Collection']
+    classifier = JavaClassImpl@448['Collection']
     memberScope = SubstitutingScope@458
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -497,7 +497,7 @@ LazyJavaClassifierType@464['Collection<? extends E>'] {
 
 LazyJavaClassifierType@468['Collection<? extends E>'] {
     arguments = ArrayList@469[1] { TypeProjectionImpl@470 }
-    classifier = JavaClassImpl@443['Collection']
+    classifier = JavaClassImpl@453['Collection']
     memberScope = SubstitutingScope@471
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -505,7 +505,7 @@ LazyJavaClassifierType@468['Collection<? extends E>'] {
 
 LazyJavaClassifierType@472['Collection<? extends E>'] {
     arguments = ArrayList@473[1] { TypeProjectionImpl@474 }
-    classifier = JavaClassImpl@448['Collection']
+    classifier = JavaClassImpl@443['Collection']
     memberScope = SubstitutingScope@475
     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@494['Collection']
+    classifier = JavaClassImpl@484['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@489['Collection']
+    classifier = JavaClassImpl@479['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@504['Collection']
+    classifier = JavaClassImpl@494['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@479['Collection']
+    classifier = JavaClassImpl@489['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@499['Collection']
+    classifier = JavaClassImpl@504['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@484['Collection']
+    classifier = JavaClassImpl@499['Collection']
     memberScope = SubstitutingScope@529
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@459
@@ -634,133 +634,133 @@ LazyJavaClassifierType@543['E'] {
     arguments = ArrayList@544[empty]
     classifier = JavaTypeParameterImpl@545['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
-LazyJavaClassifierType@546['E'] {
-    arguments = ArrayList@547[empty]
-    classifier = JavaTypeParameterImpl@548['E']
+LazyJavaClassifierType@547['E'] {
+    arguments = ArrayList@548[empty]
+    classifier = JavaTypeParameterImpl@549['E']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
-LazyJavaClassifierType@549['E'] {
-    arguments = ArrayList@550[empty]
-    classifier = JavaTypeParameterImpl@551['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@552['E'] {
-    arguments = ArrayList@553[empty]
-    classifier = JavaTypeParameterImpl@554['E']
+LazyJavaClassifierType@550['E'] {
+    arguments = ArrayList@551[empty]
+    classifier = JavaTypeParameterImpl@552['E']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
-LazyJavaClassifierType@555['E'] {
-    arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@557['E']
+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']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
-LazyJavaClassifierType@558['E'] {
-    arguments = ArrayList@559[empty]
-    classifier = JavaTypeParameterImpl@560['E']
+LazyJavaClassifierType@562['E'] {
+    arguments = ArrayList@563[empty]
+    classifier = JavaTypeParameterImpl@564['E']
+    nullable = 'false': Boolean@396
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
+}
+
+LazyJavaClassifierType@565['E'] {
+    arguments = ArrayList@566[empty]
+    classifier = JavaTypeParameterImpl@567['E']
+    nullable = 'false': Boolean@396
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+}
+
+LazyJavaClassifierType@568['E'] {
+    arguments = ArrayList@569[empty]
+    classifier = JavaTypeParameterImpl@570['E']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
-LazyJavaClassifierType@561['E'] {
-    arguments = ArrayList@562[empty]
-    classifier = JavaTypeParameterImpl@563['E']
+LazyJavaClassifierType@571['E'] {
+    arguments = ArrayList@572[empty]
+    classifier = JavaTypeParameterImpl@573['E']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
-LazyJavaClassifierType@564['E'] {
-    arguments = ArrayList@565[empty]
-    classifier = JavaTypeParameterImpl@566['E']
+LazyJavaClassifierType@574['E'] {
+    arguments = ArrayList@575[empty]
+    classifier = JavaTypeParameterImpl@576['E']
     nullable = 'false': Boolean@396
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
-LazyJavaClassifierType@567['E'] {
-    arguments = ArrayList@568[empty]
-    classifier = JavaTypeParameterImpl@569['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@570['E'] {
-    arguments = ArrayList@571[empty]
-    classifier = JavaTypeParameterImpl@572['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
-}
-
-LazyJavaClassifierType@573['E'] {
-    arguments = ArrayList@574[empty]
-    classifier = JavaTypeParameterImpl@575['E']
-    nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
-}
-
 LazyJavaClassifierType@577['E'] {
     arguments = ArrayList@578[empty]
     classifier = JavaTypeParameterImpl@579['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@580['E'] {
     arguments = ArrayList@581[empty]
     classifier = JavaTypeParameterImpl@582['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@583['E'] {
     arguments = ArrayList@584[empty]
     classifier = JavaTypeParameterImpl@585['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@586['E'] {
     arguments = ArrayList@587[empty]
     classifier = JavaTypeParameterImpl@588['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@589['E'] {
     arguments = ArrayList@590[empty]
     classifier = JavaTypeParameterImpl@591['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@592['E'] {
     arguments = ArrayList@593[empty]
     classifier = JavaTypeParameterImpl@594['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@595['E'] {
     arguments = ArrayList@596[empty]
     classifier = JavaTypeParameterImpl@597['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@598['E'] {
     arguments = ArrayList@599[empty]
     classifier = JavaTypeParameterImpl@600['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@601['E'] {
@@ -774,77 +774,77 @@ LazyJavaClassifierType@604['E'] {
     arguments = ArrayList@605[empty]
     classifier = JavaTypeParameterImpl@606['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@607['E'] {
     arguments = ArrayList@608[empty]
     classifier = JavaTypeParameterImpl@609['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@610['E'] {
     arguments = ArrayList@611[empty]
     classifier = JavaTypeParameterImpl@612['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@613['E'] {
     arguments = ArrayList@614[empty]
     classifier = JavaTypeParameterImpl@615['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@616['E'] {
     arguments = ArrayList@617[empty]
     classifier = JavaTypeParameterImpl@618['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@619['E'] {
     arguments = ArrayList@620[empty]
     classifier = JavaTypeParameterImpl@621['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@622['E'] {
     arguments = ArrayList@623[empty]
     classifier = JavaTypeParameterImpl@624['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@625['E'] {
     arguments = ArrayList@626[empty]
     classifier = JavaTypeParameterImpl@627['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@628['E'] {
     arguments = ArrayList@629[empty]
     classifier = JavaTypeParameterImpl@630['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@631['E'] {
     arguments = ArrayList@632[empty]
     classifier = JavaTypeParameterImpl@633['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@634['E'] {
     arguments = ArrayList@635[empty]
     classifier = JavaTypeParameterImpl@636['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@637['E'] {
@@ -858,14 +858,14 @@ LazyJavaClassifierType@640['E'] {
     arguments = ArrayList@641[empty]
     classifier = JavaTypeParameterImpl@642['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@643['E'] {
     arguments = ArrayList@644[empty]
     classifier = JavaTypeParameterImpl@645['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@646['E'] {
@@ -886,42 +886,42 @@ LazyJavaClassifierType@652['E'] {
     arguments = ArrayList@653[empty]
     classifier = JavaTypeParameterImpl@654['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@655['E'] {
     arguments = ArrayList@656[empty]
     classifier = JavaTypeParameterImpl@657['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@658['E'] {
     arguments = ArrayList@659[empty]
     classifier = JavaTypeParameterImpl@660['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@661['E'] {
     arguments = ArrayList@662[empty]
     classifier = JavaTypeParameterImpl@663['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@664['E'] {
     arguments = ArrayList@665[empty]
     classifier = JavaTypeParameterImpl@666['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@667['E'] {
     arguments = ArrayList@668[empty]
     classifier = JavaTypeParameterImpl@669['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@670['E'] {
@@ -942,159 +942,159 @@ LazyJavaClassifierType@676['E'] {
     arguments = ArrayList@677[empty]
     classifier = JavaTypeParameterImpl@678['E']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@679['E'] {
     arguments = ArrayList@680[empty]
-    classifier = JavaTypeParameterImpl@566['E']
+    classifier = JavaTypeParameterImpl@545['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@681['E'] {
     arguments = ArrayList@682[empty]
-    classifier = JavaTypeParameterImpl@654['E']
+    classifier = JavaTypeParameterImpl@657['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@683['E'] {
     arguments = ArrayList@684[empty]
-    classifier = JavaTypeParameterImpl@672['E']
+    classifier = JavaTypeParameterImpl@561['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@685['E'] {
     arguments = ArrayList@686[empty]
-    classifier = JavaTypeParameterImpl@560['E']
+    classifier = JavaTypeParameterImpl@654['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@687['E'] {
     arguments = ArrayList@688[empty]
-    classifier = JavaTypeParameterImpl@627['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
-}
-
-LazyJavaClassifierType@689['E'] {
-    arguments = ArrayList@690[empty]
-    classifier = JavaTypeParameterImpl@600['E']
+    classifier = JavaTypeParameterImpl@594['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
+LazyJavaClassifierType@689['E'] {
+    arguments = ArrayList@690[empty]
+    classifier = JavaTypeParameterImpl@609['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+}
+
 LazyJavaClassifierType@691['E'] {
     arguments = ArrayList@692[empty]
-    classifier = JavaTypeParameterImpl@621['E']
+    classifier = JavaTypeParameterImpl@552['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@693['E'] {
     arguments = ArrayList@694[empty]
-    classifier = JavaTypeParameterImpl@603['E']
+    classifier = JavaTypeParameterImpl@678['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@695['E'] {
     arguments = ArrayList@696[empty]
-    classifier = JavaTypeParameterImpl@541['E']
+    classifier = JavaTypeParameterImpl@660['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@697['E'] {
     arguments = ArrayList@698[empty]
-    classifier = JavaTypeParameterImpl@585['E']
+    classifier = JavaTypeParameterImpl@564['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@699['E'] {
     arguments = ArrayList@700[empty]
-    classifier = JavaTypeParameterImpl@639['E']
+    classifier = JavaTypeParameterImpl@549['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@701['E'] {
     arguments = ArrayList@702[empty]
-    classifier = JavaTypeParameterImpl@575['E']
+    classifier = JavaTypeParameterImpl@633['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@703['E'] {
     arguments = ArrayList@704[empty]
-    classifier = JavaTypeParameterImpl@645['E']
+    classifier = JavaTypeParameterImpl@558['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@705['E'] {
     arguments = ArrayList@706[empty]
-    classifier = JavaTypeParameterImpl@609['E']
+    classifier = JavaTypeParameterImpl@663['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@707['E'] {
     arguments = ArrayList@708[empty]
-    classifier = JavaTypeParameterImpl@678['E']
+    classifier = JavaTypeParameterImpl@639['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@709['E'] {
     arguments = ArrayList@710[empty]
-    classifier = JavaTypeParameterImpl@572['E']
+    classifier = JavaTypeParameterImpl@606['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@711['E'] {
     arguments = ArrayList@712[empty]
-    classifier = JavaTypeParameterImpl@545['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@713['E'] {
-    arguments = ArrayList@714[empty]
-    classifier = JavaTypeParameterImpl@669['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@715['E'] {
-    arguments = ArrayList@716[empty]
-    classifier = JavaTypeParameterImpl@563['E']
+    classifier = JavaTypeParameterImpl@573['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
-LazyJavaClassifierType@717['E'] {
-    arguments = ArrayList@718[empty]
-    classifier = JavaTypeParameterImpl@594['E']
+LazyJavaClassifierType@713['E'] {
+    arguments = ArrayList@714[empty]
+    classifier = JavaTypeParameterImpl@555['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+}
+
+LazyJavaClassifierType@715['E'] {
+    arguments = ArrayList@716[empty]
+    classifier = JavaTypeParameterImpl@675['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
+LazyJavaClassifierType@717['E'] {
+    arguments = ArrayList@718[empty]
+    classifier = JavaTypeParameterImpl@603['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+}
+
 LazyJavaClassifierType@719['E'] {
     arguments = ArrayList@720[empty]
-    classifier = JavaTypeParameterImpl@657['E']
+    classifier = JavaTypeParameterImpl@618['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@721['E'] {
     arguments = ArrayList@722[empty]
-    classifier = JavaTypeParameterImpl@554['E']
+    classifier = JavaTypeParameterImpl@651['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
@@ -1103,173 +1103,173 @@ LazyJavaClassifierType@723['E'] {
     arguments = ArrayList@724[empty]
     classifier = JavaTypeParameterImpl@579['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@725['E'] {
     arguments = ArrayList@726[empty]
-    classifier = JavaTypeParameterImpl@597['E']
+    classifier = JavaTypeParameterImpl@600['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@727['E'] {
     arguments = ArrayList@728[empty]
-    classifier = JavaTypeParameterImpl@660['E']
+    classifier = JavaTypeParameterImpl@597['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@729['E'] {
     arguments = ArrayList@730[empty]
-    classifier = JavaTypeParameterImpl@612['E']
+    classifier = JavaTypeParameterImpl@648['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@731['E'] {
     arguments = ArrayList@732[empty]
-    classifier = JavaTypeParameterImpl@606['E']
+    classifier = JavaTypeParameterImpl@585['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@733['E'] {
     arguments = ArrayList@734[empty]
-    classifier = JavaTypeParameterImpl@551['E']
+    classifier = JavaTypeParameterImpl@642['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@735['E'] {
     arguments = ArrayList@736[empty]
-    classifier = JavaTypeParameterImpl@675['E']
+    classifier = JavaTypeParameterImpl@615['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@737['E'] {
     arguments = ArrayList@738[empty]
-    classifier = JavaTypeParameterImpl@663['E']
+    classifier = JavaTypeParameterImpl@612['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@739['E'] {
     arguments = ArrayList@740[empty]
-    classifier = JavaTypeParameterImpl@651['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
-}
-
-LazyJavaClassifierType@741['E'] {
-    arguments = ArrayList@742[empty]
-    classifier = JavaTypeParameterImpl@548['E']
+    classifier = JavaTypeParameterImpl@672['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
+LazyJavaClassifierType@741['E'] {
+    arguments = ArrayList@742[empty]
+    classifier = JavaTypeParameterImpl@536['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+}
+
 LazyJavaClassifierType@743['E'] {
     arguments = ArrayList@744[empty]
-    classifier = JavaTypeParameterImpl@630['E']
+    classifier = JavaTypeParameterImpl@567['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@745['E'] {
     arguments = ArrayList@746[empty]
-    classifier = JavaTypeParameterImpl@624['E']
+    classifier = JavaTypeParameterImpl@627['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@747['E'] {
     arguments = ArrayList@748[empty]
-    classifier = JavaTypeParameterImpl@615['E']
+    classifier = JavaTypeParameterImpl@645['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@749['E'] {
     arguments = ArrayList@750[empty]
-    classifier = JavaTypeParameterImpl@633['E']
+    classifier = JavaTypeParameterImpl@591['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
 }
 
 LazyJavaClassifierType@751['E'] {
     arguments = ArrayList@752[empty]
-    classifier = JavaTypeParameterImpl@582['E']
+    classifier = JavaTypeParameterImpl@588['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
 }
 
 LazyJavaClassifierType@753['E'] {
     arguments = ArrayList@754[empty]
-    classifier = JavaTypeParameterImpl@648['E']
+    classifier = JavaTypeParameterImpl@570['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@755['E'] {
     arguments = ArrayList@756[empty]
-    classifier = JavaTypeParameterImpl@569['E']
+    classifier = JavaTypeParameterImpl@669['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@757['E'] {
     arguments = ArrayList@758[empty]
-    classifier = JavaTypeParameterImpl@618['E']
+    classifier = JavaTypeParameterImpl@621['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@759['E'] {
     arguments = ArrayList@760[empty]
-    classifier = JavaTypeParameterImpl@588['E']
-    nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
-}
-
-LazyJavaClassifierType@761['E'] {
-    arguments = ArrayList@762[empty]
-    classifier = JavaTypeParameterImpl@591['E']
+    classifier = JavaTypeParameterImpl@576['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
+LazyJavaClassifierType@761['E'] {
+    arguments = ArrayList@762[empty]
+    classifier = JavaTypeParameterImpl@636['E']
+    nullable = 'true': Boolean@407
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+}
+
 LazyJavaClassifierType@763['E'] {
     arguments = ArrayList@764[empty]
-    classifier = JavaTypeParameterImpl@666['E']
+    classifier = JavaTypeParameterImpl@630['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@765['E'] {
     arguments = ArrayList@766[empty]
-    classifier = JavaTypeParameterImpl@557['E']
+    classifier = JavaTypeParameterImpl@624['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@767['E'] {
     arguments = ArrayList@768[empty]
-    classifier = JavaTypeParameterImpl@536['E']
+    classifier = JavaTypeParameterImpl@541['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@769['E'] {
     arguments = ArrayList@770[empty]
-    classifier = JavaTypeParameterImpl@642['E']
+    classifier = JavaTypeParameterImpl@666['E']
     nullable = 'true': Boolean@407
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
 
 LazyJavaClassifierType@771['E'] {
     arguments = ArrayList@772[empty]
-    classifier = JavaTypeParameterImpl@636['E']
+    classifier = JavaTypeParameterImpl@582['E']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
 }
@@ -1300,7 +1300,7 @@ LazyJavaClassifierType@784['Iterator<E>'] {
 
 LazyJavaClassifierType@789['Iterator<E>'] {
     arguments = ArrayList@790[1] { TypeProjectionImpl@791 }
-    classifier = JavaClassImpl@776['Iterator']
+    classifier = JavaClassImpl@787['Iterator']
     memberScope = SubstitutingScope@792
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@793
@@ -1308,7 +1308,7 @@ LazyJavaClassifierType@789['Iterator<E>'] {
 
 LazyJavaClassifierType@794['Iterator<E>'] {
     arguments = ArrayList@795[1] { TypeProjectionImpl@796 }
-    classifier = JavaClassImpl@787['Iterator']
+    classifier = JavaClassImpl@776['Iterator']
     memberScope = SubstitutingScope@797
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@793
@@ -1322,20 +1322,20 @@ LazyJavaClassifierType@798['Iterator<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@793
 }
 
-LazyJavaClassifierType@367['List<E>'] {
-    arguments = ArrayList@802[1] { TypeProjectionImpl@803 }
-    classifier = JavaClassImpl@804['List']
-    memberScope = SubstitutingScope@805
+LazyJavaClassifierType@802['List<E>'] {
+    arguments = ArrayList@803[1] { TypeProjectionImpl@804 }
+    classifier = JavaClassImpl@805['List']
+    memberScope = SubstitutingScope@806
     nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@806
+    typeConstructor = DeserializedClassTypeConstructor@807
 }
 
-LazyJavaClassifierType@807['List<E>'] {
+LazyJavaClassifierType@372['List<E>'] {
     arguments = ArrayList@808[1] { TypeProjectionImpl@809 }
     classifier = JavaClassImpl@810['List']
     memberScope = SubstitutingScope@811
     nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@806
+    typeConstructor = DeserializedClassTypeConstructor@807
 }
 
 LazyJavaClassifierType@812['List<E>'] {
@@ -1343,20 +1343,20 @@ LazyJavaClassifierType@812['List<E>'] {
     classifier = JavaClassImpl@815['List']
     memberScope = SubstitutingScope@816
     nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@806
+    typeConstructor = DeserializedClassTypeConstructor@807
 }
 
-LazyJavaClassifierType@372['List<E>'] {
+LazyJavaClassifierType@367['List<E>'] {
     arguments = ArrayList@817[1] { TypeProjectionImpl@818 }
     classifier = JavaClassImpl@819['List']
     memberScope = SubstitutingScope@820
     nullable = 'false': Boolean@396
-    typeConstructor = DeserializedClassTypeConstructor@806
+    typeConstructor = DeserializedClassTypeConstructor@807
 }
 
 LazyJavaClassifierType@821['List<E>'] {
     arguments = ArrayList@822[1] { TypeProjectionImpl@823 }
-    classifier = JavaClassImpl@810['List']
+    classifier = JavaClassImpl@815['List']
     memberScope = SubstitutingScope@824
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@825
@@ -1364,7 +1364,7 @@ LazyJavaClassifierType@821['List<E>'] {
 
 LazyJavaClassifierType@826['List<E>'] {
     arguments = ArrayList@827[1] { TypeProjectionImpl@828 }
-    classifier = JavaClassImpl@815['List']
+    classifier = JavaClassImpl@805['List']
     memberScope = SubstitutingScope@829
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@825
@@ -1404,7 +1404,7 @@ LazyJavaClassifierType@846['ListIterator<E>'] {
 
 LazyJavaClassifierType@851['ListIterator<E>'] {
     arguments = ArrayList@852[1] { TypeProjectionImpl@853 }
-    classifier = JavaClassImpl@833['ListIterator']
+    classifier = JavaClassImpl@844['ListIterator']
     memberScope = SubstitutingScope@854
     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@844['ListIterator']
+    classifier = JavaClassImpl@833['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@905['Object']
+    classifier = JavaClassImpl@908['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@908['Object']
+    classifier = JavaClassImpl@878['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@870['Object']
+    classifier = JavaClassImpl@905['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@881['Object']
+    classifier = JavaClassImpl@899['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@878['Object']
+    classifier = JavaClassImpl@884['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@899['Object']
+    classifier = JavaClassImpl@887['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@875['Object']
+    classifier = JavaClassImpl@896['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@887['Object']
+    classifier = JavaClassImpl@890['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@884['Object']
+    classifier = JavaClassImpl@870['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@896['Object']
+    classifier = JavaClassImpl@875['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@890['Object']
+    classifier = JavaClassImpl@902['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@902['Object']
+    classifier = JavaClassImpl@881['Object']
     memberScope = DeserializedClassMemberScope@871
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@872
@@ -1741,7 +1741,7 @@ LazyJavaClassifierType@970['String'] {
 
 LazyJavaClassifierType@973['String'] {
     arguments = ArrayList@974[empty]
-    classifier = JavaClassImpl@972['String']
+    classifier = JavaClassImpl@969['String']
     memberScope = DeserializedClassMemberScope@965
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@966
@@ -1749,7 +1749,7 @@ LazyJavaClassifierType@973['String'] {
 
 LazyJavaClassifierType@975['String'] {
     arguments = ArrayList@976[empty]
-    classifier = JavaClassImpl@969['String']
+    classifier = JavaClassImpl@964['String']
     memberScope = DeserializedClassMemberScope@965
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@966
@@ -1757,7 +1757,7 @@ LazyJavaClassifierType@975['String'] {
 
 LazyJavaClassifierType@977['String'] {
     arguments = ArrayList@978[empty]
-    classifier = JavaClassImpl@964['String']
+    classifier = JavaClassImpl@972['String']
     memberScope = DeserializedClassMemberScope@965
     nullable = 'true': Boolean@407
     typeConstructor = DeserializedClassTypeConstructor@966
@@ -1781,19 +1781,19 @@ LazyJavaClassifierType@987['T'] {
     arguments = ArrayList@988[empty]
     classifier = JavaTypeParameterImpl@989['T']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
 }
 
 LazyJavaClassifierType@990['T'] {
     arguments = ArrayList@991[empty]
     classifier = JavaTypeParameterImpl@992['T']
     nullable = 'false': Boolean@396
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
 }
 
 LazyJavaClassifierType@993['T'] {
     arguments = ArrayList@994[empty]
-    classifier = JavaTypeParameterImpl@992['T']
+    classifier = JavaTypeParameterImpl@981['T']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
 }
@@ -1807,14 +1807,14 @@ LazyJavaClassifierType@995['T'] {
 
 LazyJavaClassifierType@997['T'] {
     arguments = ArrayList@998[empty]
-    classifier = JavaTypeParameterImpl@981['T']
+    classifier = JavaTypeParameterImpl@989['T']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@982
 }
 
 LazyJavaClassifierType@999['T'] {
     arguments = ArrayList@1000[empty]
-    classifier = JavaTypeParameterImpl@989['T']
+    classifier = JavaTypeParameterImpl@992['T']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@986
 }
@@ -1842,14 +1842,14 @@ LazyJavaClassifierType@1008['TB'] {
 
 LazyJavaClassifierType@1011['TB'] {
     arguments = ArrayList@1012[empty]
-    classifier = JavaTypeParameterImpl@1010['TB']
+    classifier = JavaTypeParameterImpl@1007['TB']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
 }
 
 LazyJavaClassifierType@1013['TB'] {
     arguments = ArrayList@1014[empty]
-    classifier = JavaTypeParameterImpl@1007['TB']
+    classifier = JavaTypeParameterImpl@1010['TB']
     nullable = 'true': Boolean@407
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1004
 }
@@ -1962,23 +1962,23 @@ LazyJavaPackageFragment@1048['util'] {
     classes('ArrayList': Name@1081) = LazyJavaClassDescriptor@161['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@1082
 }
 
-LazyJavaTypeParameterDescriptor@364['E'] {
+LazyJavaTypeParameterDescriptor@369['E'] {
     defaultType = JetTypeImpl@1083['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
     upperBounds = LinkedHashSet@1084[1] { NullableType@1085 }
     upperBoundsAsType = NullableType@1085
 }
 
-LazyJavaTypeParameterDescriptor@369['E'] {
+LazyJavaTypeParameterDescriptor@360['E'] {
     defaultType = JetTypeImpl@1086['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@542
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@546
     upperBounds = LinkedHashSet@1087[1] { NullableType@1088 }
     upperBoundsAsType = NullableType@1088
 }
 
-LazyJavaTypeParameterDescriptor@360['E'] {
+LazyJavaTypeParameterDescriptor@364['E'] {
     defaultType = JetTypeImpl@1089['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@576
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@538
     upperBounds = LinkedHashSet@1090[1] { NullableType@1091 }
     upperBoundsAsType = NullableType@1091
 }
@@ -2009,7 +2009,7 @@ LazyJavaTypeParameterDescriptor@379['TC'] {
 }
 
 LazyJavaTypeParameterResolver@1105 {
-    resolve(JavaTypeParameterImpl@1106['E']) = LazyJavaTypeParameterDescriptor@369['E']
+    resolve(JavaTypeParameterImpl@1106['E']) = LazyJavaTypeParameterDescriptor@364['E']
 }
 
 LazyJavaTypeParameterResolver@1107 {
@@ -2017,115 +2017,115 @@ LazyJavaTypeParameterResolver@1107 {
 }
 
 LazyJavaTypeParameterResolver@1109 {
-    resolve(JavaTypeParameterImpl@1110['E']) = LazyJavaTypeParameterDescriptor@364['E']
+    resolve(JavaTypeParameterImpl@1110['E']) = LazyJavaTypeParameterDescriptor@369['E']
 }
 
 LazyJavaTypeParameterResolver@1111 {
-    resolve(JavaTypeParameterImpl@633['E']) = null
+    resolve(JavaTypeParameterImpl@660['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1112 {
-    resolve(JavaTypeParameterImpl@657['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1113 {
-    resolve(JavaTypeParameterImpl@651['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1114 {
-    resolve(JavaTypeParameterImpl@675['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1115 {
-    resolve(JavaTypeParameterImpl@642['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1116 {
-    resolve(JavaTypeParameterImpl@575['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1117 {
-    resolve(JavaTypeParameterImpl@541['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1118 {
-    resolve(JavaTypeParameterImpl@618['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1119 {
-    resolve(JavaTypeParameterImpl@678['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1120 {
-    resolve(JavaTypeParameterImpl@545['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1121 {
-    resolve(JavaTypeParameterImpl@621['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1122 {
-    resolve(JavaTypeParameterImpl@609['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1123 {
-    resolve(JavaTypeParameterImpl@585['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1124 {
-    resolve(JavaTypeParameterImpl@672['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1125 {
-    resolve(JavaTypeParameterImpl@582['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1126 {
-    resolve(JavaTypeParameterImpl@557['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1127 {
     resolve(JavaTypeParameterImpl@597['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1128 {
-    resolve(JavaTypeParameterImpl@615['E']) = null
+LazyJavaTypeParameterResolver@1113 {
+    resolve(JavaTypeParameterImpl@576['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1129 {
+LazyJavaTypeParameterResolver@1114 {
     resolve(JavaTypeParameterImpl@612['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1130 {
-    resolve(JavaTypeParameterImpl@569['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1131 {
+LazyJavaTypeParameterResolver@1115 {
     resolve(JavaTypeParameterImpl@579['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1132 {
-    resolve(JavaTypeParameterImpl@627['E']) = null
+LazyJavaTypeParameterResolver@1116 {
+    resolve(JavaTypeParameterImpl@558['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1133 {
-    resolve(JavaTypeParameterImpl@551['E']) = null
+LazyJavaTypeParameterResolver@1117 {
+    resolve(JavaTypeParameterImpl@545['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1134 {
+LazyJavaTypeParameterResolver@1118 {
     resolve(JavaTypeParameterImpl@603['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1119 {
+    resolve(JavaTypeParameterImpl@591['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1120 {
+    resolve(JavaTypeParameterImpl@675['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1121 {
+    resolve(JavaTypeParameterImpl@570['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1122 {
+    resolve(JavaTypeParameterImpl@606['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1123 {
+    resolve(JavaTypeParameterImpl@639['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1124 {
+    resolve(JavaTypeParameterImpl@645['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1125 {
+    resolve(JavaTypeParameterImpl@651['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1126 {
+    resolve(JavaTypeParameterImpl@633['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1127 {
+    resolve(JavaTypeParameterImpl@663['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1128 {
+    resolve(JavaTypeParameterImpl@618['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1129 {
+    resolve(JavaTypeParameterImpl@585['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1130 {
+    resolve(JavaTypeParameterImpl@672['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1131 {
+    resolve(JavaTypeParameterImpl@600['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1132 {
+    resolve(JavaTypeParameterImpl@654['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1133 {
+    resolve(JavaTypeParameterImpl@594['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1134 {
+    resolve(JavaTypeParameterImpl@627['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1135 {
-    resolve(JavaTypeParameterImpl@624['E']) = null
+    resolve(JavaTypeParameterImpl@642['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1136 {
-    resolve(JavaTypeParameterImpl@1137['T']) = LazyJavaTypeParameterDescriptor@1096['T']
+    resolve(JavaTypeParameterImpl@1137['T']) = LazyJavaTypeParameterDescriptor@1092['T']
 }
 
 LazyJavaTypeParameterResolver@1138 {
-    resolve(JavaTypeParameterImpl@1139['T']) = LazyJavaTypeParameterDescriptor@1092['T']
+    resolve(JavaTypeParameterImpl@1139['T']) = LazyJavaTypeParameterDescriptor@1096['T']
 }
 
 LazyJavaTypeParameterResolver@1140 {
@@ -2133,9 +2133,19 @@ LazyJavaTypeParameterResolver@1140 {
 }
 
 LazyJavaTypeParameterResolver@1142 {
-    resolve(JavaTypeParameterImpl@1003['TB']) = null
+    resolve(JavaTypeParameterImpl@1010['TB']) = null
 }
 
 LazyJavaTypeParameterResolver@1143 {
     resolve(JavaTypeParameterImpl@1144['TC']) = LazyJavaTypeParameterDescriptor@379['TC']
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log b/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
index e34e8b4baf0..a4d43d1eadf 100644
--- a/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/InheritedGenericFunction.lazy.log
@@ -186,3 +186,8 @@ LazyJavaTypeParameterResolver@129 {
 LazyJavaTypeParameterResolver@131 {
     resolve(JavaTypeParameterImpl@132['TB']) = LazyJavaTypeParameterDescriptor@125['TB']
 }
+
+ResolutionTaskHolder@133 {
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@135 }
+    <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 09568195845..846130b827a 100644
--- a/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/KJKInheritance.lazy.log
@@ -73,3 +73,26 @@ LazyJavaPackageFragment@50['lang'] {
     functions('foo': Name@60) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@67
 }
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log b/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
index 19ba921c555..c1e040e6f27 100644
--- a/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/KJKInheritanceGeneric.lazy.log
@@ -108,3 +108,31 @@ LazyJavaPackageFragment@65['lang'] {
     functions('foo': Name@78) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
+
+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]
+    <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@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log b/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
index 19ec6705d6e..2def85459b0 100644
--- a/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/OverrideVararg.lazy.log
@@ -81,3 +81,21 @@ LazyJavaPackageFragment@53['java'] {
 LazyJavaPackageFragment@55['lang'] {
     deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@73
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log b/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
index 380101e4974..8ca215257da 100644
--- a/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/Simple.lazy.log
@@ -10,63 +10,63 @@ LazyJavaClassDescriptor@2['A'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@5
     nestedClasses('f': Name@6) = null // through LazyJavaClassMemberScope@5
-    properties('f': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['A']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['A']
 }
 
-LazyJavaClassTypeConstructor@13['A'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['A'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
+LazyJavaClassifierType@16['Object'] {
+    classifier = JavaClassImpl@17['Object']
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('A': FqName@23) = null
-    packageFragments('aa': FqName@24) = LazyJavaPackageFragment@25['aa']
-    packageFragments('aa.A': FqName@26) = null
-    packageFragments('java': FqName@27) = LazyJavaPackageFragment@28['java']
-    packageFragments('java.lang': FqName@29) = LazyJavaPackageFragment@30['lang']
-    packageFragments('java.lang.A': FqName@31) = null
-    packageFragments('kotlin': FqName@32) = null
-    packageFragments('kotlin.A': FqName@33) = null
-    packageFragments('kotlin.io': FqName@34) = null
-    packageFragments('kotlin.jvm': FqName@35) = null
-    topLevelClasses(JavaClassImpl@36['A']) = LazyJavaClassDescriptor@2['A']
+LazyJavaPackageFragmentProvider@19 {
+    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
+    packageFragments('A': FqName@22) = null
+    packageFragments('aa': FqName@23) = LazyJavaPackageFragment@24['aa']
+    packageFragments('aa.A': FqName@25) = null
+    packageFragments('java': FqName@26) = LazyJavaPackageFragment@27['java']
+    packageFragments('java.lang': FqName@28) = LazyJavaPackageFragment@29['lang']
+    packageFragments('java.lang.A': FqName@30) = null
+    packageFragments('kotlin': FqName@31) = null
+    packageFragments('kotlin.A': FqName@32) = null
+    packageFragments('kotlin.io': FqName@33) = null
+    packageFragments('kotlin.jvm': FqName@34) = null
+    topLevelClasses(JavaClassImpl@35['A']) = LazyJavaClassDescriptor@2['A']
 }
 
-LazyJavaPackageFragment@22['<root>'] {
-    classes('A': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('aa': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('f': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('aa': Name@41) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('f': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
+LazyJavaPackageFragment@21['<root>'] {
+    classes('A': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('aa': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('aa': Name@40) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
-LazyJavaPackageFragment@25['aa'] {
+LazyJavaPackageFragment@24['aa'] {
     classes('A': Name@43) = LazyJavaClassDescriptor@2['A'] // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('A': Name@45) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('A': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
-LazyJavaPackageFragment@28['java'] {
+LazyJavaPackageFragment@27['java'] {
     classes('lang': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('lang': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@39 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('lang': Name@49) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
-LazyJavaPackageFragment@30['lang'] {
-    classes('f': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('f': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log b/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
index a40bfd929d0..27c4cdfa6f8 100644
--- a/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/StaticMembersFromSuperclasses.lazy.log
@@ -80,3 +80,23 @@ LazyJavaPackageFragment@40['lang'] {
 LazyJavaTypeAttributes@55 {
     howThisTypeIsUsedAccordingToAnnotations$delegate = TypeUsage@56
 }
+
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
+    <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]
+    <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 1413504289f..92ab5b44c97 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
@@ -3,150 +3,166 @@ LazyJavaClassDescriptor@0['X'] {
     functions('barN': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['barN'] } // through LazyJavaClassMemberScope@5
     functions('fooN': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['fooN'] } // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
-    properties('barN': Name@2) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    properties('fooN': Name@6) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['X']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@11['X']
 }
 
-LazyJavaClassDescriptor@13['Y'] {
-    constructors = ArrayList@14[1] { JavaConstructorDescriptor@15['<init>'] } // through LazyJavaClassMemberScope@16
-    defaultType = JetTypeImpl@17['Y']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@16
+LazyJavaClassDescriptor@12['Y'] {
+    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
+    defaultType = JetTypeImpl@16['Y']
+    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
     functionTypeForSamInterface = null
-    functions('barN': Name@2) = ArrayList@19[1] { JavaMethodDescriptor@20['barN'] } // through LazyJavaClassMemberScope@16
-    functions('fooN': Name@6) = ArrayList@21[1] { JavaMethodDescriptor@22['fooN'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@16
-    nestedClassIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@16
-    nestedClasses('barN': Name@2) = null // through LazyJavaClassMemberScope@16
-    nestedClasses('fooN': Name@6) = null // through LazyJavaClassMemberScope@16
-    properties('barN': Name@2) = EmptyList@10[empty] // through LazyJavaClassMemberScope@16
-    properties('fooN': Name@6) = EmptyList@10[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@25['Y']
+    functions('barN': Name@2) = ArrayList@18[1] { JavaMethodDescriptor@19['barN'] } // through LazyJavaClassMemberScope@15
+    functions('fooN': Name@6) = ArrayList@20[1] { JavaMethodDescriptor@21['fooN'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@15
+    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@15
+    nestedClasses('barN': Name@2) = null // through LazyJavaClassMemberScope@15
+    nestedClasses('fooN': Name@6) = null // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@24['Y']
 }
 
-LazyJavaClassTypeConstructor@12['X'] {
-    parameters = ArrayList@26[1] { LazyJavaTypeParameterDescriptor@27['T'] }
-    supertypes = ArrayList@28[1] { JetTypeImpl@29['Any'] }
+LazyJavaClassTypeConstructor@11['X'] {
+    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['T'] }
+    supertypes = ArrayList@27[1] { JetTypeImpl@28['Any'] }
 }
 
-LazyJavaClassTypeConstructor@25['Y'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['X<String>'] }
+LazyJavaClassTypeConstructor@24['Y'] {
+    parameters = ArrayList@29[empty]
+    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['X<String>'] }
 }
 
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@35
+LazyJavaClassifierType@32['Object'] {
+    classifier = JavaClassImpl@33['Object']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'false': Boolean@39
-    typeConstructor = DeserializedClassTypeConstructor@40
+LazyJavaClassifierType@35['String'] {
+    arguments = ArrayList@36[empty]
+    classifier = JavaClassImpl@37['String']
+    nullable = 'false': Boolean@38
+    typeConstructor = DeserializedClassTypeConstructor@39
 }
 
-LazyJavaClassifierType@41['String'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'true': Boolean@43
-    typeConstructor = DeserializedClassTypeConstructor@40
+LazyJavaClassifierType@40['String'] {
+    arguments = ArrayList@41[empty]
+    classifier = JavaClassImpl@37['String']
+    nullable = 'true': Boolean@42
+    typeConstructor = DeserializedClassTypeConstructor@39
 }
 
-LazyJavaClassifierType@44['T'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@46['T']
-    nullable = 'false': Boolean@39
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
+LazyJavaClassifierType@43['T'] {
+    arguments = ArrayList@44[empty]
+    classifier = JavaTypeParameterImpl@45['T']
+    nullable = 'false': Boolean@38
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
-LazyJavaClassifierType@48['T'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaTypeParameterImpl@50['T']
-    nullable = 'false': Boolean@39
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
+LazyJavaClassifierType@47['T'] {
+    arguments = ArrayList@48[empty]
+    classifier = JavaTypeParameterImpl@49['T']
+    nullable = 'false': Boolean@38
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
-LazyJavaClassifierType@51['T'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaTypeParameterImpl@50['T']
-    nullable = 'true': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
+LazyJavaClassifierType@50['T'] {
+    arguments = ArrayList@51[empty]
+    classifier = JavaTypeParameterImpl@45['T']
+    nullable = 'true': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
-LazyJavaClassifierType@53['T'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@46['T']
-    nullable = 'true': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
+LazyJavaClassifierType@52['T'] {
+    arguments = ArrayList@53[empty]
+    classifier = JavaTypeParameterImpl@49['T']
+    nullable = 'true': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
-LazyJavaClassifierType@32['X<String>'] {
-    arguments = ArrayList@55[1] { TypeProjectionImpl@56 }
-    classifier = JavaClassImpl@57['X']
-    memberScope = SubstitutingScope@58
-    typeConstructor = LazyJavaClassTypeConstructor@12['X']
+LazyJavaClassifierType@31['X<String>'] {
+    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
+    classifier = JavaClassImpl@56['X']
+    memberScope = SubstitutingScope@57
+    typeConstructor = LazyJavaClassTypeConstructor@11['X']
 }
 
-LazyJavaPackageFragmentProvider@59 {
-    packageFragments('<root>': FqName@60) = LazyJavaPackageFragment@61['<root>']
-    packageFragments('Any': FqName@62) = null
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('java.lang.Any': FqName@67) = null
-    packageFragments('kotlin': FqName@68) = null
-    packageFragments('kotlin.Any': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    topLevelClasses(JavaClassImpl@57['X']) = LazyJavaClassDescriptor@0['X']
-    topLevelClasses(JavaClassImpl@72['Y']) = LazyJavaClassDescriptor@13['Y']
+LazyJavaPackageFragmentProvider@58 {
+    packageFragments('<root>': FqName@59) = LazyJavaPackageFragment@60['<root>']
+    packageFragments('Any': FqName@61) = null
+    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
+    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
+    packageFragments('java.lang.Any': FqName@66) = null
+    packageFragments('kotlin': FqName@67) = null
+    packageFragments('kotlin.Any': FqName@68) = null
+    packageFragments('kotlin.io': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = null
+    topLevelClasses(JavaClassImpl@56['X']) = LazyJavaClassDescriptor@0['X']
+    topLevelClasses(JavaClassImpl@71['Y']) = LazyJavaClassDescriptor@12['Y']
 }
 
-LazyJavaPackageFragment@61['<root>'] {
-    classes('Any': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('Y': Name@75) = LazyJavaClassDescriptor@13['Y'] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('barN': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('fooN': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('Y': Name@75) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('barN': Name@2) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('fooN': Name@6) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@74
+LazyJavaPackageFragment@60['<root>'] {
+    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('Y': Name@74) = LazyJavaClassDescriptor@12['Y'] // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Y': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@64['java'] {
+LazyJavaPackageFragment@63['java'] {
     classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('lang': Name@80) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@66['lang'] {
-    classes('Y': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('barN': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('fooN': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Y': Name@75) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('barN': Name@2) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('fooN': Name@6) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+LazyJavaPackageFragment@65['lang'] {
+    classes('Y': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@75 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('Y': Name@74) = EmptyList@76[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaTypeParameterDescriptor@27['T'] {
+LazyJavaTypeParameterDescriptor@26['T'] {
     defaultType = JetTypeImpl@84['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
     upperBounds = LinkedHashSet@85[1] { NullableType@86 }
 }
 
 LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@88['T']) = LazyJavaTypeParameterDescriptor@27['T']
+    resolve(JavaTypeParameterImpl@88['T']) = LazyJavaTypeParameterDescriptor@26['T']
 }
 
 LazyJavaTypeParameterResolver@89 {
-    resolve(JavaTypeParameterImpl@50['T']) = null
+    resolve(JavaTypeParameterImpl@45['T']) = null
 }
 
 LazyJavaTypeParameterResolver@90 {
-    resolve(JavaTypeParameterImpl@46['T']) = null
+    resolve(JavaTypeParameterImpl@49['T']) = null
+}
+
+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]
+    <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@103 {
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@105 }
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@105 }
 }
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 4aeec5f6068..ae85ab47431 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
@@ -7,161 +7,177 @@ LazyJavaClassDescriptor@2['X'] {
     functions('barN': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['barN'] } // through LazyJavaClassMemberScope@7
     functions('fooN': Name@8) = ArrayList@9[1] { JavaMethodDescriptor@10['fooN'] } // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@7
-    properties('barN': Name@4) = EmptyList@12[empty] // through LazyJavaClassMemberScope@7
-    properties('fooN': Name@8) = EmptyList@12[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@14['X']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@13['X']
 }
 
-LazyJavaClassDescriptor@15['Y'] {
-    constructors = ArrayList@16[1] { JavaConstructorDescriptor@17['<init>'] } // through LazyJavaClassMemberScope@18
-    defaultType = JetTypeImpl@19['Y']
-    enumEntryIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@18
+LazyJavaClassDescriptor@14['Y'] {
+    constructors = ArrayList@15[1] { JavaConstructorDescriptor@16['<init>'] } // through LazyJavaClassMemberScope@17
+    defaultType = JetTypeImpl@18['Y']
+    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@17
     functionTypeForSamInterface = null
-    functions('barN': Name@4) = ArrayList@21[1] { JavaMethodDescriptor@22['barN'] } // through LazyJavaClassMemberScope@18
-    functions('fooN': Name@8) = ArrayList@23[1] { JavaMethodDescriptor@24['fooN'] } // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@18
-    nestedClassIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@18
-    nestedClasses('barN': Name@4) = null // through LazyJavaClassMemberScope@18
-    nestedClasses('fooN': Name@8) = null // through LazyJavaClassMemberScope@18
-    properties('barN': Name@4) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
-    properties('fooN': Name@8) = EmptyList@12[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@27['Y']
+    functions('barN': Name@4) = ArrayList@20[1] { JavaMethodDescriptor@21['barN'] } // through LazyJavaClassMemberScope@17
+    functions('fooN': Name@8) = ArrayList@22[1] { JavaMethodDescriptor@23['fooN'] } // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@17
+    nestedClassIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@17
+    nestedClasses('barN': Name@4) = null // through LazyJavaClassMemberScope@17
+    nestedClasses('fooN': Name@8) = null // through LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@26['Y']
 }
 
 LazyJavaClassTypeConstructor@1['A'] {
-    parameters = ArrayList@28[empty]
-    supertypes = ArrayList@29[1] { JetTypeImpl@30['Any'] }
+    parameters = ArrayList@27[empty]
+    supertypes = ArrayList@28[1] { JetTypeImpl@29['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['X'] {
-    parameters = ArrayList@31[1] { LazyJavaTypeParameterDescriptor@32['T'] }
-    supertypes = ArrayList@33[1] { JetTypeImpl@30['Any'] }
+LazyJavaClassTypeConstructor@13['X'] {
+    parameters = ArrayList@30[1] { LazyJavaTypeParameterDescriptor@31['T'] }
+    supertypes = ArrayList@32[1] { JetTypeImpl@29['Any'] }
 }
 
-LazyJavaClassTypeConstructor@27['Y'] {
-    parameters = ArrayList@34[empty]
-    supertypes = ArrayList@35[1] { LazyJavaClassifierType@36['X<A>'] }
+LazyJavaClassTypeConstructor@26['Y'] {
+    parameters = ArrayList@33[empty]
+    supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['X<A>'] }
 }
 
-LazyJavaClassifierType@37['A'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['A']
-    nullable = 'false': Boolean@40
+LazyJavaClassifierType@36['A'] {
+    arguments = ArrayList@37[empty]
+    classifier = JavaClassImpl@38['A']
+    nullable = 'false': Boolean@39
     typeConstructor = LazyJavaClassTypeConstructor@1['A']
 }
 
-LazyJavaClassifierType@41['A'] {
-    arguments = ArrayList@42[empty]
-    classifier = JavaClassImpl@39['A']
-    nullable = 'true': Boolean@43
+LazyJavaClassifierType@40['A'] {
+    arguments = ArrayList@41[empty]
+    classifier = JavaClassImpl@38['A']
+    nullable = 'true': Boolean@42
     typeConstructor = LazyJavaClassTypeConstructor@1['A']
 }
 
-LazyJavaClassifierType@44['Object'] {
-    classifier = JavaClassImpl@45['Object']
-    typeConstructor = DeserializedClassTypeConstructor@46
+LazyJavaClassifierType@43['Object'] {
+    classifier = JavaClassImpl@44['Object']
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
-LazyJavaClassifierType@47['Object'] {
-    classifier = JavaClassImpl@48['Object']
-    typeConstructor = DeserializedClassTypeConstructor@46
+LazyJavaClassifierType@46['Object'] {
+    classifier = JavaClassImpl@47['Object']
+    typeConstructor = DeserializedClassTypeConstructor@45
 }
 
-LazyJavaClassifierType@49['T'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaTypeParameterImpl@51['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+LazyJavaClassifierType@48['T'] {
+    arguments = ArrayList@49[empty]
+    classifier = JavaTypeParameterImpl@50['T']
+    nullable = 'false': Boolean@39
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
 
-LazyJavaClassifierType@53['T'] {
-    arguments = ArrayList@54[empty]
-    classifier = JavaTypeParameterImpl@55['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+LazyJavaClassifierType@52['T'] {
+    arguments = ArrayList@53[empty]
+    classifier = JavaTypeParameterImpl@54['T']
+    nullable = 'false': Boolean@39
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
 
-LazyJavaClassifierType@56['T'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaTypeParameterImpl@51['T']
-    nullable = 'true': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+LazyJavaClassifierType@55['T'] {
+    arguments = ArrayList@56[empty]
+    classifier = JavaTypeParameterImpl@54['T']
+    nullable = 'true': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
 
-LazyJavaClassifierType@58['T'] {
-    arguments = ArrayList@59[empty]
-    classifier = JavaTypeParameterImpl@55['T']
-    nullable = 'true': Boolean@43
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+LazyJavaClassifierType@57['T'] {
+    arguments = ArrayList@58[empty]
+    classifier = JavaTypeParameterImpl@50['T']
+    nullable = 'true': Boolean@42
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
 }
 
-LazyJavaClassifierType@36['X<A>'] {
-    arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
-    classifier = JavaClassImpl@62['X']
-    memberScope = SubstitutingScope@63
-    typeConstructor = LazyJavaClassTypeConstructor@14['X']
+LazyJavaClassifierType@35['X<A>'] {
+    arguments = ArrayList@59[1] { TypeProjectionImpl@60 }
+    classifier = JavaClassImpl@61['X']
+    memberScope = SubstitutingScope@62
+    typeConstructor = LazyJavaClassTypeConstructor@13['X']
 }
 
-LazyJavaPackageFragmentProvider@64 {
-    packageFragments('<root>': FqName@65) = LazyJavaPackageFragment@66['<root>']
-    packageFragments('Any': FqName@67) = null
-    packageFragments('java': FqName@68) = LazyJavaPackageFragment@69['java']
-    packageFragments('java.lang': FqName@70) = LazyJavaPackageFragment@71['lang']
-    packageFragments('java.lang.Any': FqName@72) = null
-    packageFragments('kotlin': FqName@73) = null
-    packageFragments('kotlin.Any': FqName@74) = null
-    packageFragments('kotlin.io': FqName@75) = null
-    packageFragments('kotlin.jvm': FqName@76) = null
-    topLevelClasses(JavaClassImpl@39['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@62['X']) = LazyJavaClassDescriptor@2['X']
-    topLevelClasses(JavaClassImpl@77['Y']) = LazyJavaClassDescriptor@15['Y']
+LazyJavaPackageFragmentProvider@63 {
+    packageFragments('<root>': FqName@64) = LazyJavaPackageFragment@65['<root>']
+    packageFragments('Any': FqName@66) = null
+    packageFragments('java': FqName@67) = LazyJavaPackageFragment@68['java']
+    packageFragments('java.lang': FqName@69) = LazyJavaPackageFragment@70['lang']
+    packageFragments('java.lang.Any': FqName@71) = null
+    packageFragments('kotlin': FqName@72) = null
+    packageFragments('kotlin.Any': FqName@73) = null
+    packageFragments('kotlin.io': FqName@74) = null
+    packageFragments('kotlin.jvm': FqName@75) = null
+    topLevelClasses(JavaClassImpl@38['A']) = LazyJavaClassDescriptor@0['A']
+    topLevelClasses(JavaClassImpl@61['X']) = LazyJavaClassDescriptor@2['X']
+    topLevelClasses(JavaClassImpl@76['Y']) = LazyJavaClassDescriptor@14['Y']
 }
 
-LazyJavaPackageFragment@66['<root>'] {
-    classes('Any': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('Y': Name@80) = LazyJavaClassDescriptor@15['Y'] // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('barN': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('fooN': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('Y': Name@80) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('barN': Name@4) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('fooN': Name@8) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@79
+LazyJavaPackageFragment@65['<root>'] {
+    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('Y': Name@79) = LazyJavaClassDescriptor@14['Y'] // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('Y': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
-LazyJavaPackageFragment@69['java'] {
+LazyJavaPackageFragment@68['java'] {
     classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
-LazyJavaPackageFragment@71['lang'] {
-    classes('Y': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('barN': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('fooN': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Y': Name@80) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('barN': Name@4) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('fooN': Name@8) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+LazyJavaPackageFragment@70['lang'] {
+    classes('Y': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('Y': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaTypeParameterDescriptor@32['T'] {
+LazyJavaTypeParameterDescriptor@31['T'] {
     defaultType = JetTypeImpl@89['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@51
     upperBounds = LinkedHashSet@90[1] { NullableType@91 }
 }
 
 LazyJavaTypeParameterResolver@92 {
-    resolve(JavaTypeParameterImpl@93['T']) = LazyJavaTypeParameterDescriptor@32['T']
+    resolve(JavaTypeParameterImpl@93['T']) = LazyJavaTypeParameterDescriptor@31['T']
 }
 
 LazyJavaTypeParameterResolver@94 {
-    resolve(JavaTypeParameterImpl@55['T']) = null
+    resolve(JavaTypeParameterImpl@54['T']) = null
 }
 
 LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@51['T']) = null
+    resolve(JavaTypeParameterImpl@50['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]
+    <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@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
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 0c2a1ebda0b..6f7d5105d1b 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-SpecialTypes.lazy.log
@@ -3,147 +3,168 @@ LazyJavaClassDescriptor@0['X'] {
     functions('bar': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['bar'] } // through LazyJavaClassMemberScope@5
     functions('foo': Name@6) = ArrayList@7[1] { JavaMethodDescriptor@8['foo'] } // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
-    properties('bar': Name@2) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    properties('foo': Name@6) = EmptyList@10[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['X']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@11['X']
 }
 
-LazyJavaClassDescriptor@13['Y'] {
-    constructors = ArrayList@14[1] { JavaConstructorDescriptor@15['<init>'] } // through LazyJavaClassMemberScope@16
-    defaultType = JetTypeImpl@17['Y']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@16
+LazyJavaClassDescriptor@12['Y'] {
+    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
+    defaultType = JetTypeImpl@16['Y']
+    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
     functionTypeForSamInterface = null
-    functions('bar': Name@2) = ArrayList@19[1] { JavaMethodDescriptor@20['bar'] } // through LazyJavaClassMemberScope@16
-    functions('foo': Name@6) = ArrayList@21[1] { JavaMethodDescriptor@22['foo'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@16
-    nestedClassIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@16
-    nestedClasses('bar': Name@2) = null // through LazyJavaClassMemberScope@16
-    nestedClasses('foo': Name@6) = null // through LazyJavaClassMemberScope@16
-    properties('bar': Name@2) = EmptyList@10[empty] // through LazyJavaClassMemberScope@16
-    properties('foo': Name@6) = EmptyList@10[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@25['Y']
+    functions('bar': Name@2) = ArrayList@18[1] { JavaMethodDescriptor@19['bar'] } // through LazyJavaClassMemberScope@15
+    functions('foo': Name@6) = ArrayList@20[1] { JavaMethodDescriptor@21['foo'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@15
+    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@15
+    nestedClasses('bar': Name@2) = null // through LazyJavaClassMemberScope@15
+    nestedClasses('foo': Name@6) = null // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@24['Y']
 }
 
-LazyJavaClassTypeConstructor@12['X'] {
-    parameters = ArrayList@26[1] { LazyJavaTypeParameterDescriptor@27['T'] }
-    supertypes = ArrayList@28[1] { JetTypeImpl@29['Any'] }
+LazyJavaClassTypeConstructor@11['X'] {
+    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['T'] }
+    supertypes = ArrayList@27[1] { JetTypeImpl@28['Any'] }
 }
 
-LazyJavaClassTypeConstructor@25['Y'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['X<String>'] }
+LazyJavaClassTypeConstructor@24['Y'] {
+    parameters = ArrayList@29[empty]
+    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['X<String>'] }
 }
 
-LazyJavaClassifierType@33['Object'] {
-    classifier = JavaClassImpl@34['Object']
-    typeConstructor = DeserializedClassTypeConstructor@35
+LazyJavaClassifierType@32['Object'] {
+    classifier = JavaClassImpl@33['Object']
+    typeConstructor = DeserializedClassTypeConstructor@34
 }
 
-LazyJavaClassifierType@36['String'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@38['String']
-    memberScope = DeserializedClassMemberScope@39
-    nullable = 'false': Boolean@40
-    typeConstructor = DeserializedClassTypeConstructor@41
+LazyJavaClassifierType@35['String'] {
+    arguments = ArrayList@36[empty]
+    classifier = JavaClassImpl@37['String']
+    memberScope = DeserializedClassMemberScope@38
+    nullable = 'false': Boolean@39
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
-LazyJavaClassifierType@42['String'] {
-    arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['String']
-    nullable = 'true': Boolean@44
-    typeConstructor = DeserializedClassTypeConstructor@41
+LazyJavaClassifierType@41['String'] {
+    arguments = ArrayList@42[empty]
+    classifier = JavaClassImpl@37['String']
+    nullable = 'true': Boolean@43
+    typeConstructor = DeserializedClassTypeConstructor@40
 }
 
-LazyJavaClassifierType@45['T'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaTypeParameterImpl@47['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+LazyJavaClassifierType@44['T'] {
+    arguments = ArrayList@45[empty]
+    classifier = JavaTypeParameterImpl@46['T']
+    nullable = 'false': Boolean@39
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
 }
 
-LazyJavaClassifierType@49['T'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaTypeParameterImpl@51['T']
-    nullable = 'false': Boolean@40
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+LazyJavaClassifierType@48['T'] {
+    arguments = ArrayList@49[empty]
+    classifier = JavaTypeParameterImpl@50['T']
+    nullable = 'false': Boolean@39
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
 }
 
-LazyJavaClassifierType@52['T'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@51['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+LazyJavaClassifierType@51['T'] {
+    arguments = ArrayList@52[empty]
+    classifier = JavaTypeParameterImpl@46['T']
+    nullable = 'true': Boolean@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
 }
 
-LazyJavaClassifierType@54['T'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@47['T']
-    nullable = 'true': Boolean@44
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+LazyJavaClassifierType@53['T'] {
+    arguments = ArrayList@54[empty]
+    classifier = JavaTypeParameterImpl@50['T']
+    nullable = 'true': Boolean@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
 }
 
-LazyJavaClassifierType@32['X<String>'] {
-    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
-    classifier = JavaClassImpl@58['X']
-    memberScope = SubstitutingScope@59
-    typeConstructor = LazyJavaClassTypeConstructor@12['X']
+LazyJavaClassifierType@31['X<String>'] {
+    arguments = ArrayList@55[1] { TypeProjectionImpl@56 }
+    classifier = JavaClassImpl@57['X']
+    memberScope = SubstitutingScope@58
+    typeConstructor = LazyJavaClassTypeConstructor@11['X']
 }
 
-LazyJavaPackageFragmentProvider@60 {
-    packageFragments('<root>': FqName@61) = LazyJavaPackageFragment@62['<root>']
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('kotlin': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    topLevelClasses(JavaClassImpl@58['X']) = LazyJavaClassDescriptor@0['X']
-    topLevelClasses(JavaClassImpl@70['Y']) = LazyJavaClassDescriptor@13['Y']
+LazyJavaPackageFragmentProvider@59 {
+    packageFragments('<root>': FqName@60) = LazyJavaPackageFragment@61['<root>']
+    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
+    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
+    packageFragments('kotlin': FqName@66) = null
+    packageFragments('kotlin.io': FqName@67) = null
+    packageFragments('kotlin.jvm': FqName@68) = null
+    topLevelClasses(JavaClassImpl@57['X']) = LazyJavaClassDescriptor@0['X']
+    topLevelClasses(JavaClassImpl@69['Y']) = LazyJavaClassDescriptor@12['Y']
 }
 
-LazyJavaPackageFragment@62['<root>'] {
-    classes('Y': Name@71) = LazyJavaClassDescriptor@13['Y'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('bar': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('Y': Name@71) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('bar': Name@2) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@6) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
+LazyJavaPackageFragment@61['<root>'] {
+    classes('Y': Name@70) = LazyJavaClassDescriptor@12['Y'] // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('Y': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@64['java'] {
+LazyJavaPackageFragment@63['java'] {
     classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('lang': Name@77) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@76
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-LazyJavaPackageFragment@66['lang'] {
-    classes('Y': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('bar': Name@2) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('foo': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('Y': Name@71) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('bar': Name@2) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('foo': Name@6) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+LazyJavaPackageFragment@65['lang'] {
+    classes('Y': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('Y': Name@70) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaTypeParameterDescriptor@27['T'] {
+LazyJavaTypeParameterDescriptor@26['T'] {
     defaultType = JetTypeImpl@81['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@47
     upperBounds = LinkedHashSet@82[1] { NullableType@83 }
 }
 
 LazyJavaTypeParameterResolver@84 {
-    resolve(JavaTypeParameterImpl@85['T']) = LazyJavaTypeParameterDescriptor@27['T']
+    resolve(JavaTypeParameterImpl@85['T']) = LazyJavaTypeParameterDescriptor@26['T']
 }
 
 LazyJavaTypeParameterResolver@86 {
-    resolve(JavaTypeParameterImpl@51['T']) = null
+    resolve(JavaTypeParameterImpl@50['T']) = null
 }
 
 LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@47['T']) = null
+    resolve(JavaTypeParameterImpl@46['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]
+    <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@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 }
 }
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 5a73f397bf2..c34cd88d0a4 100644
--- a/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/SupertypeArgumentsNullability-UserTypes.lazy.log
@@ -4,171 +4,187 @@ LazyJavaClassDescriptor@0['A'] {
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@2
     nestedClassIndex = LinkedHashMap@7 // through LazyJavaClassMemberScope@2
     nestedClasses('hashCode': Name@3) = null // through LazyJavaClassMemberScope@2
-    properties('hashCode': Name@3) = EmptyList@8[empty] // through LazyJavaClassMemberScope@2
-    typeConstructor = LazyJavaClassTypeConstructor@9['A']
+    typeConstructor = LazyJavaClassTypeConstructor@8['A']
 }
 
-LazyJavaClassDescriptor@10['X'] {
-    defaultType = JetTypeImpl@11['X<1>']
-    functions('bar': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['bar'] } // through LazyJavaClassMemberScope@15
-    functions('foo': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@18['foo'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@15
-    properties('bar': Name@12) = EmptyList@8[empty] // through LazyJavaClassMemberScope@15
-    properties('foo': Name@16) = EmptyList@8[empty] // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@20['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@21['X']
+LazyJavaClassDescriptor@9['X'] {
+    defaultType = JetTypeImpl@10['X<1>']
+    functions('bar': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['bar'] } // through LazyJavaClassMemberScope@14
+    functions('foo': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@17['foo'] } // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@14
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@20['X']
 }
 
-LazyJavaClassDescriptor@22['Y'] {
-    constructors = ArrayList@23[1] { JavaConstructorDescriptor@24['<init>'] } // through LazyJavaClassMemberScope@25
-    defaultType = JetTypeImpl@26['Y']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@25
+LazyJavaClassDescriptor@21['Y'] {
+    constructors = ArrayList@22[1] { JavaConstructorDescriptor@23['<init>'] } // through LazyJavaClassMemberScope@24
+    defaultType = JetTypeImpl@25['Y']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@24
     functionTypeForSamInterface = null
-    functions('bar': Name@12) = ArrayList@28[1] { JavaMethodDescriptor@29['bar'] } // through LazyJavaClassMemberScope@25
-    functions('foo': Name@16) = ArrayList@30[1] { JavaMethodDescriptor@31['foo'] } // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@25
-    nestedClassIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@25
-    nestedClasses('bar': Name@12) = null // through LazyJavaClassMemberScope@25
-    nestedClasses('foo': Name@16) = null // through LazyJavaClassMemberScope@25
-    properties('bar': Name@12) = EmptyList@8[empty] // through LazyJavaClassMemberScope@25
-    properties('foo': Name@16) = EmptyList@8[empty] // through LazyJavaClassMemberScope@25
-    typeConstructor = LazyJavaClassTypeConstructor@34['Y']
+    functions('bar': Name@11) = ArrayList@27[1] { JavaMethodDescriptor@28['bar'] } // through LazyJavaClassMemberScope@24
+    functions('foo': Name@15) = ArrayList@29[1] { JavaMethodDescriptor@30['foo'] } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@24
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@24
+    nestedClasses('bar': Name@11) = null // through LazyJavaClassMemberScope@24
+    nestedClasses('foo': Name@15) = null // through LazyJavaClassMemberScope@24
+    typeConstructor = LazyJavaClassTypeConstructor@33['Y']
 }
 
-LazyJavaClassTypeConstructor@9['A'] {
-    parameters = ArrayList@35[empty]
-    supertypes = ArrayList@36[1] { JetTypeImpl@37['Any'] }
+LazyJavaClassTypeConstructor@8['A'] {
+    parameters = ArrayList@34[empty]
+    supertypes = ArrayList@35[1] { JetTypeImpl@36['Any'] }
 }
 
-LazyJavaClassTypeConstructor@21['X'] {
-    parameters = ArrayList@38[1] { LazyJavaTypeParameterDescriptor@39['T'] }
-    supertypes = ArrayList@40[1] { JetTypeImpl@37['Any'] }
+LazyJavaClassTypeConstructor@20['X'] {
+    parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['T'] }
+    supertypes = ArrayList@39[1] { JetTypeImpl@36['Any'] }
 }
 
-LazyJavaClassTypeConstructor@34['Y'] {
-    parameters = ArrayList@41[empty]
-    supertypes = ArrayList@42[1] { LazyJavaClassifierType@43['X<A>'] }
+LazyJavaClassTypeConstructor@33['Y'] {
+    parameters = ArrayList@40[empty]
+    supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['X<A>'] }
 }
 
-LazyJavaClassifierType@44['A'] {
-    arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@46['A']
+LazyJavaClassifierType@43['A'] {
+    arguments = ArrayList@44[empty]
+    classifier = JavaClassImpl@45['A']
     memberScope = LazyJavaClassMemberScope@2
-    nullable = 'false': Boolean@47
-    typeConstructor = LazyJavaClassTypeConstructor@9['A']
+    nullable = 'false': Boolean@46
+    typeConstructor = LazyJavaClassTypeConstructor@8['A']
 }
 
-LazyJavaClassifierType@48['A'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@46['A']
-    nullable = 'true': Boolean@50
-    typeConstructor = LazyJavaClassTypeConstructor@9['A']
+LazyJavaClassifierType@47['A'] {
+    arguments = ArrayList@48[empty]
+    classifier = JavaClassImpl@45['A']
+    nullable = 'true': Boolean@49
+    typeConstructor = LazyJavaClassTypeConstructor@8['A']
 }
 
-LazyJavaClassifierType@51['Object'] {
-    classifier = JavaClassImpl@52['Object']
-    typeConstructor = DeserializedClassTypeConstructor@53
+LazyJavaClassifierType@50['Object'] {
+    classifier = JavaClassImpl@51['Object']
+    typeConstructor = DeserializedClassTypeConstructor@52
 }
 
-LazyJavaClassifierType@54['Object'] {
-    classifier = JavaClassImpl@55['Object']
-    typeConstructor = DeserializedClassTypeConstructor@53
+LazyJavaClassifierType@53['Object'] {
+    classifier = JavaClassImpl@54['Object']
+    typeConstructor = DeserializedClassTypeConstructor@52
 }
 
-LazyJavaClassifierType@56['T'] {
-    arguments = ArrayList@57[empty]
-    classifier = JavaTypeParameterImpl@58['T']
-    nullable = 'false': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+LazyJavaClassifierType@55['T'] {
+    arguments = ArrayList@56[empty]
+    classifier = JavaTypeParameterImpl@57['T']
+    nullable = 'false': Boolean@46
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
-LazyJavaClassifierType@60['T'] {
-    arguments = ArrayList@61[empty]
-    classifier = JavaTypeParameterImpl@62['T']
-    nullable = 'false': Boolean@47
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+LazyJavaClassifierType@59['T'] {
+    arguments = ArrayList@60[empty]
+    classifier = JavaTypeParameterImpl@61['T']
+    nullable = 'false': Boolean@46
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
-LazyJavaClassifierType@63['T'] {
-    arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@62['T']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+LazyJavaClassifierType@62['T'] {
+    arguments = ArrayList@63[empty]
+    classifier = JavaTypeParameterImpl@61['T']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
-LazyJavaClassifierType@65['T'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaTypeParameterImpl@58['T']
-    nullable = 'true': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+LazyJavaClassifierType@64['T'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@57['T']
+    nullable = 'true': Boolean@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
-LazyJavaClassifierType@43['X<A>'] {
-    arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
-    classifier = JavaClassImpl@69['X']
-    memberScope = SubstitutingScope@70
-    typeConstructor = LazyJavaClassTypeConstructor@21['X']
+LazyJavaClassifierType@42['X<A>'] {
+    arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
+    classifier = JavaClassImpl@68['X']
+    memberScope = SubstitutingScope@69
+    typeConstructor = LazyJavaClassTypeConstructor@20['X']
 }
 
-LazyJavaPackageFragmentProvider@71 {
-    packageFragments('<root>': FqName@72) = LazyJavaPackageFragment@73['<root>']
-    packageFragments('java': FqName@74) = LazyJavaPackageFragment@75['java']
-    packageFragments('java.lang': FqName@76) = LazyJavaPackageFragment@77['lang']
-    packageFragments('kotlin': FqName@78) = null
-    packageFragments('kotlin.io': FqName@79) = null
-    packageFragments('kotlin.jvm': FqName@80) = null
-    topLevelClasses(JavaClassImpl@46['A']) = LazyJavaClassDescriptor@0['A']
-    topLevelClasses(JavaClassImpl@69['X']) = LazyJavaClassDescriptor@10['X']
-    topLevelClasses(JavaClassImpl@81['Y']) = LazyJavaClassDescriptor@22['Y']
+LazyJavaPackageFragmentProvider@70 {
+    packageFragments('<root>': FqName@71) = LazyJavaPackageFragment@72['<root>']
+    packageFragments('java': FqName@73) = LazyJavaPackageFragment@74['java']
+    packageFragments('java.lang': FqName@75) = LazyJavaPackageFragment@76['lang']
+    packageFragments('kotlin': FqName@77) = null
+    packageFragments('kotlin.io': FqName@78) = null
+    packageFragments('kotlin.jvm': FqName@79) = null
+    topLevelClasses(JavaClassImpl@45['A']) = LazyJavaClassDescriptor@0['A']
+    topLevelClasses(JavaClassImpl@68['X']) = LazyJavaClassDescriptor@9['X']
+    topLevelClasses(JavaClassImpl@80['Y']) = LazyJavaClassDescriptor@21['Y']
 }
 
-LazyJavaPackageFragment@73['<root>'] {
-    classes('Y': Name@82) = LazyJavaClassDescriptor@22['Y'] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('bar': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('hashCode': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('Y': Name@82) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('bar': Name@12) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('foo': Name@16) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('hashCode': Name@3) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
+LazyJavaPackageFragment@72['<root>'] {
+    classes('Y': Name@81) = LazyJavaClassDescriptor@21['Y'] // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('Y': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@75['java'] {
+LazyJavaPackageFragment@74['java'] {
     classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('lang': Name@88) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@77['lang'] {
-    classes('Y': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('bar': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('foo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('hashCode': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Y': Name@82) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('bar': Name@12) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('foo': Name@16) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('hashCode': Name@3) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@90
+LazyJavaPackageFragment@76['lang'] {
+    classes('Y': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@90
+    functions('Y': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-LazyJavaTypeParameterDescriptor@39['T'] {
+LazyJavaTypeParameterDescriptor@38['T'] {
     defaultType = JetTypeImpl@92['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
     upperBounds = LinkedHashSet@93[1] { NullableType@94 }
 }
 
 LazyJavaTypeParameterResolver@95 {
-    resolve(JavaTypeParameterImpl@96['T']) = LazyJavaTypeParameterDescriptor@39['T']
+    resolve(JavaTypeParameterImpl@96['T']) = LazyJavaTypeParameterDescriptor@38['T']
 }
 
 LazyJavaTypeParameterResolver@97 {
-    resolve(JavaTypeParameterImpl@62['T']) = null
+    resolve(JavaTypeParameterImpl@61['T']) = null
 }
 
 LazyJavaTypeParameterResolver@98 {
-    resolve(JavaTypeParameterImpl@58['T']) = null
+    resolve(JavaTypeParameterImpl@57['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]
+    <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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
index ad16157799a..710a0eb1111 100644
--- a/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/UnboxingNulls.lazy.log
@@ -7,91 +7,113 @@ LazyJavaClassDescriptor@0['Test'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('t': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('t': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['Test']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Test']
 }
 
-LazyJavaClassTypeConstructor@13['Test'] {
-    parameters = ArrayList@14[1] { LazyJavaTypeParameterDescriptor@15['T'] }
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
+LazyJavaClassTypeConstructor@12['Test'] {
+    parameters = ArrayList@13[1] { LazyJavaTypeParameterDescriptor@14['T'] }
+    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
 }
 
-LazyJavaClassifierType@18['Object'] {
-    classifier = JavaClassImpl@19['Object']
-    typeConstructor = DeserializedClassTypeConstructor@20
+LazyJavaClassifierType@17['Object'] {
+    classifier = JavaClassImpl@18['Object']
+    typeConstructor = DeserializedClassTypeConstructor@19
 }
 
-LazyJavaClassifierType@21['T'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaTypeParameterImpl@23['T']
-    nullable = 'false': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
+LazyJavaClassifierType@20['T'] {
+    arguments = ArrayList@21[empty]
+    classifier = JavaTypeParameterImpl@22['T']
+    nullable = 'false': Boolean@23
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
 }
 
-LazyJavaClassifierType@26['T'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaTypeParameterImpl@23['T']
-    nullable = 'true': Boolean@28
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
+LazyJavaClassifierType@25['T'] {
+    arguments = ArrayList@26[empty]
+    classifier = JavaTypeParameterImpl@22['T']
+    nullable = 'true': Boolean@27
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
 }
 
-LazyJavaPackageFragmentProvider@29 {
-    packageFragments('<root>': FqName@30) = LazyJavaPackageFragment@31['<root>']
-    packageFragments('Int': FqName@32) = null
-    packageFragments('a': FqName@33) = LazyJavaPackageFragment@34['a']
-    packageFragments('a.Int': FqName@35) = null
-    packageFragments('a.a': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.Int': FqName@41) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.Int': FqName@43) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-    topLevelClasses(JavaClassImpl@46['Test']) = LazyJavaClassDescriptor@0['Test']
+LazyJavaPackageFragmentProvider@28 {
+    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
+    packageFragments('Int': FqName@31) = null
+    packageFragments('a': FqName@32) = LazyJavaPackageFragment@33['a']
+    packageFragments('a.Int': FqName@34) = null
+    packageFragments('a.a': FqName@35) = null
+    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
+    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
+    packageFragments('java.lang.Int': FqName@40) = null
+    packageFragments('kotlin': FqName@41) = null
+    packageFragments('kotlin.Int': FqName@42) = null
+    packageFragments('kotlin.io': FqName@43) = null
+    packageFragments('kotlin.jvm': FqName@44) = null
+    topLevelClasses(JavaClassImpl@45['Test']) = LazyJavaClassDescriptor@0['Test']
 }
 
-LazyJavaPackageFragment@34['a'] {
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('Test': Name@49) = LazyJavaClassDescriptor@0['Test'] // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('a': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('plus': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('t': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('Test': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('plus': Name@51) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('t': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@48
+LazyJavaPackageFragment@33['a'] {
+    classes('Int': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('Test': Name@48) = LazyJavaClassDescriptor@0['Test'] // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('a': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('Test': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
+LazyJavaPackageFragment@37['java'] {
+    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('lang': Name@55) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
-LazyJavaPackageFragment@40['lang'] {
-    classes('a': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('plus': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('t': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('plus': Name@51) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('t': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+LazyJavaPackageFragment@39['lang'] {
+    classes('a': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
-LazyJavaTypeParameterDescriptor@15['T'] {
-    defaultType = JetTypeImpl@60['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-    upperBounds = LinkedHashSet@61[1] { NullableType@62 }
+LazyJavaTypeParameterDescriptor@14['T'] {
+    defaultType = JetTypeImpl@58['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
+    upperBounds = LinkedHashSet@59[1] { NullableType@60 }
+}
+
+LazyJavaTypeParameterResolver@61 {
+    resolve(JavaTypeParameterImpl@62['T']) = LazyJavaTypeParameterDescriptor@14['T']
 }
 
 LazyJavaTypeParameterResolver@63 {
-    resolve(JavaTypeParameterImpl@64['T']) = LazyJavaTypeParameterDescriptor@15['T']
+    resolve(JavaTypeParameterImpl@22['T']) = null
 }
 
-LazyJavaTypeParameterResolver@65 {
-    resolve(JavaTypeParameterImpl@23['T']) = null
+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]
+}
+
+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]
+    <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/j+k/ambiguousSamAdapters.lazy.log b/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
index 014a84f7a19..ff86a02a263 100644
--- a/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/ambiguousSamAdapters.lazy.log
@@ -156,3 +156,66 @@ LazyJavaPackageFragment@97['lang'] {
     functions('Runnable': Name@106) = ArrayList@114[1] { SamConstructorDescriptor@115['Runnable'] } // through LazyPackageFragmentScopeForJavaPackage@113
     memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@113
 }
+
+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]
+    <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, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@129 {
+    <name not found> = ArrayList@130[2] { ResolutionCandidate@131, ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[4] { ResolutionCandidate@131, ResolutionCandidate@134, ResolutionCandidate@132, ... }
+    <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]
+    <name not found> = EmptyList@9[empty]
+    <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 e2b4f71582a..6bf01e648ac 100644
--- a/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/cantDeclareIfSamAdapterIsInherited.lazy.log
@@ -89,3 +89,13 @@ LazyJavaPackageFragment@60['java'] {
     functions('lang': Name@77) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log b/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log
index 2187ea1f7af..ceca594e8f5 100644
--- a/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/inheritAbstractSamAdapter.lazy.log
@@ -93,14 +93,14 @@ LazyJavaClassifierType@73['Runnable'] {
 
 LazyJavaClassifierType@76['Runnable'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaClassImpl@75['Runnable']
+    classifier = JavaClassImpl@72['Runnable']
     nullable = 'true': Boolean@78
     typeConstructor = LazyJavaClassTypeConstructor@53['Runnable']
 }
 
 LazyJavaClassifierType@79['Runnable'] {
     arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@72['Runnable']
+    classifier = JavaClassImpl@75['Runnable']
     nullable = 'true': Boolean@78
     typeConstructor = LazyJavaClassTypeConstructor@53['Runnable']
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
index 9fa2d0d5c3b..70150beca02 100644
--- a/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/invisiblePackagePrivateInheritedMember.lazy.log
@@ -75,3 +75,30 @@ LazyJavaPackageFragment@43['lang'] {
     functions('F': Name@58) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
 }
+
+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]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
+    <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/j+k/kt1402.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
index 430ec3a9402..98ed0520d09 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt1402.lazy.log
@@ -76,3 +76,26 @@ LazyJavaPackageFragment@39['lang'] {
     functions('doSmth': Name@57) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
 }
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
index 20332668089..9d00df3a5e1 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt1431.lazy.log
@@ -12,7 +12,6 @@ LazyJavaClassDescriptor@0['C'] {
     nestedClasses('foo': Name@9) = null // through LazyJavaClassMemberScope@3
     properties('create': Name@4) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
     properties('create': Name@4) = EmptyList@8[empty] // through LazyJavaStaticClassScope@7
-    properties('foo': Name@9) = EmptyList@8[empty] // through LazyJavaClassMemberScope@3
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@16['C']
 }
@@ -134,19 +133,43 @@ LazyJavaPackageFragment@73['java'] {
 }
 
 LazyJavaPackageFragment@75['lang'] {
-    classes('foo': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@91
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('foo': Name@9) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
 LazyJavaTypeParameterDescriptor@18['B'] {
-    defaultType = JetTypeImpl@93['B']
+    defaultType = JetTypeImpl@92['B']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@25
-    upperBounds = LinkedHashSet@94[1] { DelegatingFlexibleType@95 }
-    upperBoundsAsType = DelegatingFlexibleType@95
+    upperBounds = LinkedHashSet@93[1] { DelegatingFlexibleType@94 }
+    upperBoundsAsType = DelegatingFlexibleType@94
 }
 
-LazyJavaTypeParameterResolver@96 {
-    resolve(JavaTypeParameterImpl@97['B']) = LazyJavaTypeParameterDescriptor@18['B']
+LazyJavaTypeParameterResolver@95 {
+    resolve(JavaTypeParameterImpl@96['B']) = LazyJavaTypeParameterDescriptor@18['B']
+}
+
+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]
+    <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]
+    <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/j+k/kt2394.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
index 5a5c12112de..38ee22dbe54 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2394.lazy.log
@@ -43,9 +43,32 @@ LazyJavaPackageFragment@19['java'] {
     memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
-LazyJavaPackageFragment@21['lang'] {
-    classes('iterator': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('iterator': Name@45) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
index c28cdfef09d..95af734ee1f 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2619.lazy.log
@@ -43,3 +43,8 @@ LazyJavaPackageFragment@14['java'] {
     functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <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 91c9ebf6244..47b6f871258 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2641.lazy.log
@@ -90,14 +90,14 @@ LazyJavaClassifierType@65['T'] {
 
 LazyJavaClassifierType@68['T'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@67['T']
+    classifier = JavaTypeParameterImpl@62['T']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
 }
 
 LazyJavaClassifierType@71['T'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@62['T']
+    classifier = JavaTypeParameterImpl@67['T']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
 }
@@ -193,17 +193,32 @@ LazyJavaTypeParameterResolver@147 {
 }
 
 LazyJavaTypeParameterResolver@149 {
-    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@46['T']
+    resolve(JavaTypeParameterImpl@67['T']) = LazyJavaTypeParameterDescriptor@38['T']
 }
 
-LazyJavaTypeParameterResolver@151 {
-    resolve(JavaTypeParameterImpl@62['T']) = LazyJavaTypeParameterDescriptor@38['T']
+LazyJavaTypeParameterResolver@150 {
+    resolve(JavaTypeParameterImpl@151['T']) = LazyJavaTypeParameterDescriptor@46['T']
 }
 
 LazyJavaTypeParameterResolver@152 {
-    resolve(JavaTypeParameterImpl@62['T']) = null
+    resolve(JavaTypeParameterImpl@67['T']) = null
 }
 
 LazyJavaTypeParameterResolver@153 {
-    resolve(JavaTypeParameterImpl@67['T']) = null
+    resolve(JavaTypeParameterImpl@62['T']) = null
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
index 37b63067bd7..8118238c600 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt2890.lazy.log
@@ -112,49 +112,49 @@ LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
     classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-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@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@81['E'] {
     arguments = ArrayList@82[empty]
     classifier = JavaTypeParameterImpl@83['E']
     nullable = 'false': Boolean@61
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@84['E'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaTypeParameterImpl@72['E']
+    classifier = JavaTypeParameterImpl@83['E']
     nullable = 'true': Boolean@67
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@80['E']
+    classifier = JavaTypeParameterImpl@72['E']
     nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@83['E']
+    classifier = JavaTypeParameterImpl@76['E']
     nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
 LazyJavaClassifierType@90['E'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaClassifierType@92['Integer'] {
@@ -173,14 +173,14 @@ LazyJavaClassifierType@96['Integer'] {
 
 LazyJavaClassifierType@99['Integer'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@94['Integer']
+    classifier = JavaClassImpl@98['Integer']
     nullable = 'true': Boolean@67
     typeConstructor = DeserializedClassTypeConstructor@95
 }
 
 LazyJavaClassifierType@101['Integer'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaClassImpl@98['Integer']
+    classifier = JavaClassImpl@94['Integer']
     nullable = 'true': Boolean@67
     typeConstructor = DeserializedClassTypeConstructor@95
 }
@@ -299,18 +299,58 @@ LazyJavaPackageFragment@143['util'] {
 
 LazyJavaTypeParameterDescriptor@39['E'] {
     defaultType = JetTypeImpl@169['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
     upperBounds = LinkedHashSet@170[1] { NullableType@171 }
 }
 
 LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
 LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@72['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@173['E']) = LazyJavaTypeParameterDescriptor@39['E']
 }
 
-LazyJavaTypeParameterResolver@173 {
-    resolve(JavaTypeParameterImpl@174['E']) = LazyJavaTypeParameterDescriptor@39['E']
+LazyJavaTypeParameterResolver@174 {
+    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@34['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]
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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/j+k/kt3307.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
index ea23b216289..542d424618c 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt3307.lazy.log
@@ -5,141 +5,168 @@ LazyJavaClassDescriptor@0['Bug'] {
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
     nestedClasses('save': Name@9) = null // through LazyJavaClassMemberScope@3
-    properties('save': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['Bug']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
 }
 
-LazyJavaClassDescriptor@14['SubBug'] {
-    constructors = ArrayList@15[1] { JavaConstructorDescriptor@16['<init>'] } // through LazyJavaClassMemberScope@17
-    defaultType = JetTypeImpl@18['SubBug']
-    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@17
+LazyJavaClassDescriptor@12['SubBug'] {
+    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
+    defaultType = JetTypeImpl@16['SubBug']
+    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
     functionTypeForSamInterface = null
-    functions('save': Name@10) = ArrayList@20[1] { JavaMethodDescriptor@21['save'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@17
-    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@17
-    nestedClasses('save': Name@10) = null // through LazyJavaClassMemberScope@17
-    properties('save': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@25['SubBug']
+    functions('save': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['save'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@15
+    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@15
+    nestedClasses('save': Name@18) = null // through LazyJavaClassMemberScope@15
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@24['SubBug']
 }
 
-LazyJavaClassTypeConstructor@13['Bug'] {
-    parameters = ArrayList@26[empty]
-    supertypes = ArrayList@27[1] { JetTypeImpl@28['Any'] }
+LazyJavaClassTypeConstructor@11['Bug'] {
+    parameters = ArrayList@25[empty]
+    supertypes = ArrayList@26[1] { JetTypeImpl@27['Any'] }
 }
 
-LazyJavaClassTypeConstructor@25['SubBug'] {
-    parameters = ArrayList@29[empty]
-    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['Bug'] }
-}
-
-LazyJavaClassifierType@32['Bug'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Bug']
-    memberScope = LazyJavaClassMemberScope@3
-    nullable = 'false': Boolean@35
-    typeConstructor = LazyJavaClassTypeConstructor@13['Bug']
-}
-
-LazyJavaClassifierType@36['Bug'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@34['Bug']
-    memberScope = LazyJavaClassMemberScope@3
-    nullable = 'true': Boolean@38
-    typeConstructor = LazyJavaClassTypeConstructor@13['Bug']
+LazyJavaClassTypeConstructor@24['SubBug'] {
+    parameters = ArrayList@28[empty]
+    supertypes = ArrayList@29[1] { LazyJavaClassifierType@30['Bug'] }
 }
 
 LazyJavaClassifierType@31['Bug'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@40['Bug']
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Bug']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@13['Bug']
+    nullable = 'false': Boolean@34
+    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
 }
 
-LazyJavaClassifierType@41['Object'] {
-    classifier = JavaClassImpl@42['Object']
-    typeConstructor = DeserializedClassTypeConstructor@43
+LazyJavaClassifierType@35['Bug'] {
+    arguments = ArrayList@36[empty]
+    classifier = JavaClassImpl@33['Bug']
+    memberScope = LazyJavaClassMemberScope@3
+    nullable = 'true': Boolean@37
+    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
 }
 
-LazyJavaClassifierType@44['Object'] {
-    classifier = JavaClassImpl@45['Object']
-    typeConstructor = DeserializedClassTypeConstructor@43
+LazyJavaClassifierType@30['Bug'] {
+    arguments = ArrayList@38[empty]
+    classifier = JavaClassImpl@39['Bug']
+    memberScope = LazyJavaClassMemberScope@3
+    typeConstructor = LazyJavaClassTypeConstructor@11['Bug']
 }
 
-LazyJavaClassifierType@46['RET'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaTypeParameterImpl@48['RET']
-    nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+LazyJavaClassifierType@40['Object'] {
+    classifier = JavaClassImpl@41['Object']
+    typeConstructor = DeserializedClassTypeConstructor@42
 }
 
-LazyJavaClassifierType@50['RET'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@48['RET']
-    nullable = 'true': Boolean@38
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+LazyJavaClassifierType@43['Object'] {
+    classifier = JavaClassImpl@44['Object']
+    typeConstructor = DeserializedClassTypeConstructor@42
 }
 
-LazyJavaClassifierType@52['SubBug'] {
-    arguments = ArrayList@53[empty]
-    classifier = JavaClassImpl@54['SubBug']
-    nullable = 'false': Boolean@35
-    typeConstructor = LazyJavaClassTypeConstructor@25['SubBug']
+LazyJavaClassifierType@45['RET'] {
+    arguments = ArrayList@46[empty]
+    classifier = JavaTypeParameterImpl@47['RET']
+    nullable = 'false': Boolean@34
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
 }
 
-LazyJavaClassifierType@55['SubBug'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@54['SubBug']
-    nullable = 'true': Boolean@38
-    typeConstructor = LazyJavaClassTypeConstructor@25['SubBug']
+LazyJavaClassifierType@49['RET'] {
+    arguments = ArrayList@50[empty]
+    classifier = JavaTypeParameterImpl@47['RET']
+    nullable = 'true': Boolean@37
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
 }
 
-LazyJavaPackageFragmentProvider@57 {
-    packageFragments('<root>': FqName@58) = LazyJavaPackageFragment@59['<root>']
-    packageFragments('Bug': FqName@60) = null
-    packageFragments('java': FqName@61) = LazyJavaPackageFragment@62['java']
-    packageFragments('java.lang': FqName@63) = LazyJavaPackageFragment@64['lang']
-    packageFragments('java.lang.Bug': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Bug': FqName@67) = null
-    packageFragments('kotlin.io': FqName@68) = null
-    packageFragments('kotlin.jvm': FqName@69) = null
-    topLevelClasses(JavaClassImpl@40['Bug']) = LazyJavaClassDescriptor@0['Bug']
-    topLevelClasses(JavaClassImpl@70['SubBug']) = LazyJavaClassDescriptor@14['SubBug']
+LazyJavaClassifierType@51['SubBug'] {
+    arguments = ArrayList@52[empty]
+    classifier = JavaClassImpl@53['SubBug']
+    nullable = 'false': Boolean@34
+    typeConstructor = LazyJavaClassTypeConstructor@24['SubBug']
 }
 
-LazyJavaPackageFragment@59['<root>'] {
-    classes('Bug': Name@71) = LazyJavaClassDescriptor@0['Bug'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('SubBug': Name@73) = LazyJavaClassDescriptor@14['SubBug'] // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('save': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('SubBug': Name@73) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('save': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@72
+LazyJavaClassifierType@54['SubBug'] {
+    arguments = ArrayList@55[empty]
+    classifier = JavaClassImpl@53['SubBug']
+    nullable = 'true': Boolean@37
+    typeConstructor = LazyJavaClassTypeConstructor@24['SubBug']
 }
 
-LazyJavaPackageFragment@62['java'] {
+LazyJavaPackageFragmentProvider@56 {
+    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
+    packageFragments('Bug': FqName@59) = null
+    packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
+    packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
+    packageFragments('java.lang.Bug': FqName@64) = null
+    packageFragments('kotlin': FqName@65) = null
+    packageFragments('kotlin.Bug': FqName@66) = null
+    packageFragments('kotlin.io': FqName@67) = null
+    packageFragments('kotlin.jvm': FqName@68) = null
+    topLevelClasses(JavaClassImpl@39['Bug']) = LazyJavaClassDescriptor@0['Bug']
+    topLevelClasses(JavaClassImpl@69['SubBug']) = LazyJavaClassDescriptor@12['SubBug']
+}
+
+LazyJavaPackageFragment@58['<root>'] {
+    classes('Bug': Name@70) = LazyJavaClassDescriptor@0['Bug'] // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('SubBug': Name@72) = LazyJavaClassDescriptor@12['SubBug'] // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('SubBug': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@71
+}
+
+LazyJavaPackageFragment@61['java'] {
     classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('lang': Name@78) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-LazyJavaPackageFragment@64['lang'] {
-    classes('SubBug': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('save': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('SubBug': Name@73) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('save': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+LazyJavaPackageFragment@63['lang'] {
+    classes('SubBug': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('SubBug': Name@72) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaTypeParameterDescriptor@82['RET'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
     upperBounds = LinkedHashSet@83[1] { DelegatingFlexibleType@84 }
 }
 
 LazyJavaTypeParameterResolver@85 {
     resolve(JavaTypeParameterImpl@86['RET']) = LazyJavaTypeParameterDescriptor@82['RET']
 }
+
+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]
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log b/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
index b081a18ac32..f27f51a8176 100644
--- a/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/kt3311.lazy.log
@@ -74,3 +74,37 @@ LazyJavaPackageFragment@52['lang'] {
     functions('Sub': Name@66) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
 }
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log b/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
index 919c81a38f6..17190eb74d7 100644
--- a/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/mutableIterator.lazy.log
@@ -12,286 +12,349 @@ LazyJavaClassDescriptor@0['JC'] {
     nestedClasses('getIterator': Name@7) = null // through LazyJavaClassMemberScope@3
     nestedClasses('setIterable': Name@10) = null // through LazyJavaClassMemberScope@3
     nestedClasses('setIterator': Name@13) = null // through LazyJavaClassMemberScope@3
-    properties('getIterable': Name@4) = EmptyList@18[empty] // through LazyJavaClassMemberScope@3
-    properties('getIterator': Name@7) = EmptyList@18[empty] // through LazyJavaClassMemberScope@3
-    properties('setIterable': Name@10) = EmptyList@18[empty] // through LazyJavaClassMemberScope@3
-    properties('setIterator': Name@13) = EmptyList@18[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['JC']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@19['JC']
 }
 
-LazyJavaClassTypeConstructor@20['JC'] {
-    parameters = ArrayList@21[1] { LazyJavaTypeParameterDescriptor@22['T'] }
-    supertypes = ArrayList@23[1] { JetTypeImpl@24['Any'] }
+LazyJavaClassTypeConstructor@19['JC'] {
+    parameters = ArrayList@20[1] { LazyJavaTypeParameterDescriptor@21['T'] }
+    supertypes = ArrayList@22[1] { JetTypeImpl@23['Any'] }
 }
 
-LazyJavaClassifierType@25['Iterable<T>'] {
-    arguments = ArrayList@26[1] { TypeProjectionImpl@27 }
-    classifier = JavaClassImpl@28['Iterable']
-    memberScope = SubstitutingScope@29
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
+LazyJavaClassifierType@24['Iterable<T>'] {
+    arguments = ArrayList@25[1] { TypeProjectionImpl@26 }
+    classifier = JavaClassImpl@27['Iterable']
+    memberScope = SubstitutingScope@28
+    nullable = 'false': Boolean@29
+    typeConstructor = DeserializedClassTypeConstructor@30
 }
 
-LazyJavaClassifierType@32['Iterable<T>'] {
-    arguments = ArrayList@33[1] { TypeProjectionImpl@34 }
-    classifier = JavaClassImpl@35['Iterable']
-    memberScope = SubstitutingScope@36
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@31
+LazyJavaClassifierType@31['Iterable<T>'] {
+    arguments = ArrayList@32[1] { TypeProjectionImpl@33 }
+    classifier = JavaClassImpl@34['Iterable']
+    memberScope = SubstitutingScope@35
+    nullable = 'false': Boolean@29
+    typeConstructor = DeserializedClassTypeConstructor@30
 }
 
-LazyJavaClassifierType@37['Iterable<T>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@35['Iterable']
-    memberScope = SubstitutingScope@40
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@36['Iterable<T>'] {
+    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
+    classifier = JavaClassImpl@34['Iterable']
+    memberScope = SubstitutingScope@39
+    nullable = 'true': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaClassifierType@43['Iterable<T>'] {
-    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
-    classifier = JavaClassImpl@28['Iterable']
-    memberScope = SubstitutingScope@46
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@42['Iterable<T>'] {
+    arguments = ArrayList@43[1] { TypeProjectionImpl@44 }
+    classifier = JavaClassImpl@27['Iterable']
+    memberScope = SubstitutingScope@45
+    nullable = 'true': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaClassifierType@47['Iterator<T>'] {
-    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@50['Iterator']
-    memberScope = SubstitutingScope@51
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@52
+LazyJavaClassifierType@46['Iterator<T>'] {
+    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
+    classifier = JavaClassImpl@49['Iterator']
+    memberScope = SubstitutingScope@50
+    nullable = 'false': Boolean@29
+    typeConstructor = DeserializedClassTypeConstructor@51
 }
 
-LazyJavaClassifierType@53['Iterator<T>'] {
-    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@56['Iterator']
-    memberScope = SubstitutingScope@57
-    nullable = 'false': Boolean@30
-    typeConstructor = DeserializedClassTypeConstructor@52
+LazyJavaClassifierType@52['Iterator<T>'] {
+    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
+    classifier = JavaClassImpl@55['Iterator']
+    memberScope = SubstitutingScope@56
+    nullable = 'false': Boolean@29
+    typeConstructor = DeserializedClassTypeConstructor@51
 }
 
-LazyJavaClassifierType@58['Iterator<T>'] {
-    arguments = ArrayList@59[1] { TypeProjectionImpl@60 }
-    classifier = JavaClassImpl@56['Iterator']
-    memberScope = SubstitutingScope@61
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@62
+LazyJavaClassifierType@57['Iterator<T>'] {
+    arguments = ArrayList@58[1] { TypeProjectionImpl@59 }
+    classifier = JavaClassImpl@55['Iterator']
+    memberScope = SubstitutingScope@60
+    nullable = 'true': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@61
 }
 
-LazyJavaClassifierType@63['Iterator<T>'] {
-    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
-    classifier = JavaClassImpl@50['Iterator']
-    memberScope = SubstitutingScope@66
-    nullable = 'true': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@62
+LazyJavaClassifierType@62['Iterator<T>'] {
+    arguments = ArrayList@63[1] { TypeProjectionImpl@64 }
+    classifier = JavaClassImpl@49['Iterator']
+    memberScope = SubstitutingScope@65
+    nullable = 'true': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@61
 }
 
-LazyJavaClassifierType@67['Object'] {
-    classifier = JavaClassImpl@68['Object']
-    typeConstructor = DeserializedClassTypeConstructor@69
+LazyJavaClassifierType@66['Object'] {
+    classifier = JavaClassImpl@67['Object']
+    typeConstructor = DeserializedClassTypeConstructor@68
 }
 
-LazyJavaClassifierType@70['T'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@72['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@69['T'] {
+    arguments = ArrayList@70[empty]
+    classifier = JavaTypeParameterImpl@71['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@74['T'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@73['T'] {
+    arguments = ArrayList@74[empty]
+    classifier = JavaTypeParameterImpl@75['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@77['T'] {
-    arguments = ArrayList@78[empty]
-    classifier = JavaTypeParameterImpl@79['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@76['T'] {
+    arguments = ArrayList@77[empty]
+    classifier = JavaTypeParameterImpl@78['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@80['T'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@82['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@79['T'] {
+    arguments = ArrayList@80[empty]
+    classifier = JavaTypeParameterImpl@81['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@83['T'] {
-    arguments = ArrayList@84[empty]
-    classifier = JavaTypeParameterImpl@85['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@82['T'] {
+    arguments = ArrayList@83[empty]
+    classifier = JavaTypeParameterImpl@84['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@86['T'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@88['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@85['T'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaTypeParameterImpl@87['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@89['T'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@91['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@88['T'] {
+    arguments = ArrayList@89[empty]
+    classifier = JavaTypeParameterImpl@90['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@92['T'] {
-    arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@94['T']
-    nullable = 'false': Boolean@30
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@91['T'] {
+    arguments = ArrayList@92[empty]
+    classifier = JavaTypeParameterImpl@93['T']
+    nullable = 'false': Boolean@29
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@95['T'] {
-    arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@72['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@94['T'] {
+    arguments = ArrayList@95[empty]
+    classifier = JavaTypeParameterImpl@93['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@97['T'] {
-    arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@82['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@96['T'] {
+    arguments = ArrayList@97[empty]
+    classifier = JavaTypeParameterImpl@71['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@99['T'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@91['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@98['T'] {
+    arguments = ArrayList@99[empty]
+    classifier = JavaTypeParameterImpl@90['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@101['T'] {
-    arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@94['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@100['T'] {
+    arguments = ArrayList@101[empty]
+    classifier = JavaTypeParameterImpl@78['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@103['T'] {
-    arguments = ArrayList@104[empty]
-    classifier = JavaTypeParameterImpl@76['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@102['T'] {
+    arguments = ArrayList@103[empty]
+    classifier = JavaTypeParameterImpl@84['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@105['T'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@88['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@104['T'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaTypeParameterImpl@87['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@107['T'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaTypeParameterImpl@85['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@106['T'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@81['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaClassifierType@109['T'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@79['T']
-    nullable = 'true': Boolean@41
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
+LazyJavaClassifierType@108['T'] {
+    arguments = ArrayList@109[empty]
+    classifier = JavaTypeParameterImpl@75['T']
+    nullable = 'true': Boolean@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
 }
 
-LazyJavaPackageFragmentProvider@111 {
-    packageFragments('<root>': FqName@112) = LazyJavaPackageFragment@113['<root>']
-    packageFragments('Int': FqName@114) = null
-    packageFragments('Iterable': FqName@115) = null
-    packageFragments('Iterator': FqName@116) = null
-    packageFragments('JC': FqName@117) = null
-    packageFragments('MutableIterable': FqName@118) = null
-    packageFragments('MutableIterator': FqName@119) = null
-    packageFragments('a': FqName@120) = LazyJavaPackageFragment@121['a']
-    packageFragments('a.JC': FqName@122) = null
-    packageFragments('java': FqName@123) = LazyJavaPackageFragment@124['java']
-    packageFragments('java.lang': FqName@125) = LazyJavaPackageFragment@126['lang']
-    packageFragments('java.lang.Int': FqName@127) = null
-    packageFragments('java.lang.Iterable': FqName@128) = null
-    packageFragments('java.lang.Iterator': FqName@129) = null
-    packageFragments('java.lang.JC': FqName@130) = null
-    packageFragments('java.lang.MutableIterable': FqName@131) = null
-    packageFragments('java.lang.MutableIterator': FqName@132) = null
-    packageFragments('kotlin': FqName@133) = null
-    packageFragments('kotlin.Int': FqName@134) = null
-    packageFragments('kotlin.Iterable': FqName@135) = null
-    packageFragments('kotlin.Iterator': FqName@136) = null
-    packageFragments('kotlin.JC': FqName@137) = null
-    packageFragments('kotlin.MutableIterable': FqName@138) = null
-    packageFragments('kotlin.MutableIterator': FqName@139) = null
-    packageFragments('kotlin.io': FqName@140) = null
-    packageFragments('kotlin.jvm': FqName@141) = null
-    packageFragments('n': FqName@142) = null
-    packageFragments('n.Int': FqName@143) = null
-    packageFragments('n.Iterable': FqName@144) = null
-    packageFragments('n.Iterator': FqName@145) = null
-    packageFragments('n.JC': FqName@146) = null
-    packageFragments('n.MutableIterable': FqName@147) = null
-    packageFragments('n.MutableIterator': FqName@148) = null
-    topLevelClasses(JavaClassImpl@149['JC']) = LazyJavaClassDescriptor@0['JC']
+LazyJavaPackageFragmentProvider@110 {
+    packageFragments('<root>': FqName@111) = LazyJavaPackageFragment@112['<root>']
+    packageFragments('Int': FqName@113) = null
+    packageFragments('Iterable': FqName@114) = null
+    packageFragments('Iterator': FqName@115) = null
+    packageFragments('JC': FqName@116) = null
+    packageFragments('MutableIterable': FqName@117) = null
+    packageFragments('MutableIterator': FqName@118) = null
+    packageFragments('a': FqName@119) = LazyJavaPackageFragment@120['a']
+    packageFragments('a.JC': FqName@121) = null
+    packageFragments('java': FqName@122) = LazyJavaPackageFragment@123['java']
+    packageFragments('java.lang': FqName@124) = LazyJavaPackageFragment@125['lang']
+    packageFragments('java.lang.Int': FqName@126) = null
+    packageFragments('java.lang.Iterable': FqName@127) = null
+    packageFragments('java.lang.Iterator': FqName@128) = null
+    packageFragments('java.lang.JC': FqName@129) = null
+    packageFragments('java.lang.MutableIterable': FqName@130) = null
+    packageFragments('java.lang.MutableIterator': FqName@131) = null
+    packageFragments('kotlin': FqName@132) = null
+    packageFragments('kotlin.Int': FqName@133) = null
+    packageFragments('kotlin.Iterable': FqName@134) = null
+    packageFragments('kotlin.Iterator': FqName@135) = null
+    packageFragments('kotlin.JC': FqName@136) = null
+    packageFragments('kotlin.MutableIterable': FqName@137) = null
+    packageFragments('kotlin.MutableIterator': FqName@138) = null
+    packageFragments('kotlin.io': FqName@139) = null
+    packageFragments('kotlin.jvm': FqName@140) = null
+    packageFragments('n': FqName@141) = null
+    packageFragments('n.Int': FqName@142) = null
+    packageFragments('n.Iterable': FqName@143) = null
+    packageFragments('n.Iterator': FqName@144) = null
+    packageFragments('n.JC': FqName@145) = null
+    packageFragments('n.MutableIterable': FqName@146) = null
+    packageFragments('n.MutableIterator': FqName@147) = null
+    topLevelClasses(JavaClassImpl@148['JC']) = LazyJavaClassDescriptor@0['JC']
 }
 
-LazyJavaPackageFragment@121['a'] {
-    classes('JC': Name@150) = LazyJavaClassDescriptor@0['JC'] // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('JC': Name@153) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@151
+LazyJavaPackageFragment@120['a'] {
+    classes('JC': Name@149) = LazyJavaClassDescriptor@0['JC'] // through LazyPackageFragmentScopeForJavaPackage@150
+    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('JC': Name@152) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@150
 }
 
-LazyJavaPackageFragment@124['java'] {
+LazyJavaPackageFragment@123['java'] {
     classes('lang': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('lang': Name@157) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@156
+    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@156
+    functions('lang': Name@157) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@156
     memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@156
 }
 
-LazyJavaPackageFragment@126['lang'] {
-    classes('getIterable': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('getIterator': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('setIterable': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('setIterator': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('getIterable': Name@4) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('getIterator': Name@7) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('setIterable': Name@10) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('setIterator': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@159
+LazyJavaTypeParameterDescriptor@21['T'] {
+    defaultType = JetTypeImpl@159['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@72
+    upperBounds = LinkedHashSet@160[1] { NullableType@161 }
 }
 
-LazyJavaTypeParameterDescriptor@22['T'] {
-    defaultType = JetTypeImpl@161['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-    upperBounds = LinkedHashSet@162[1] { NullableType@163 }
+LazyJavaTypeParameterResolver@162 {
+    resolve(JavaTypeParameterImpl@163['T']) = LazyJavaTypeParameterDescriptor@21['T']
 }
 
 LazyJavaTypeParameterResolver@164 {
-    resolve(JavaTypeParameterImpl@165['T']) = LazyJavaTypeParameterDescriptor@22['T']
+    resolve(JavaTypeParameterImpl@84['T']) = null
+}
+
+LazyJavaTypeParameterResolver@165 {
+    resolve(JavaTypeParameterImpl@75['T']) = null
 }
 
 LazyJavaTypeParameterResolver@166 {
-    resolve(JavaTypeParameterImpl@79['T']) = null
+    resolve(JavaTypeParameterImpl@87['T']) = null
 }
 
 LazyJavaTypeParameterResolver@167 {
-    resolve(JavaTypeParameterImpl@82['T']) = null
+    resolve(JavaTypeParameterImpl@78['T']) = null
 }
 
-LazyJavaTypeParameterResolver@168 {
-    resolve(JavaTypeParameterImpl@88['T']) = null
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
 }
 
-LazyJavaTypeParameterResolver@169 {
-    resolve(JavaTypeParameterImpl@76['T']) = null
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log b/compiler/testData/diagnostics/tests/j+k/overrideRawType.lazy.log
index 7cc981e35f3..17c257dc563 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@82['String']
+    classifier = JavaClassImpl@86['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@83
 }
 
 LazyJavaClassifierType@89['String'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@86['String']
+    classifier = JavaClassImpl@82['String']
     nullable = 'true': Boolean@65
     typeConstructor = DeserializedClassTypeConstructor@83
 }
@@ -229,3 +229,24 @@ LazyJavaTypeParameterDescriptor@50['T'] {
 LazyJavaTypeParameterResolver@143 {
     resolve(JavaTypeParameterImpl@144['T']) = LazyJavaTypeParameterDescriptor@50['T']
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
index 8e52b0a3e0e..c0a7c37599a 100644
--- a/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/packagePrivateClassStaticMember.lazy.log
@@ -50,3 +50,25 @@ LazyJavaPackageFragment@25['java'] {
 LazyJavaPackageFragment@27['lang'] {
     deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
 }
+
+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]
+    <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]
+    <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/packageVisibility.lazy.log b/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
index 5ba251efdef..fa4f45ee4fb 100644
--- a/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/packageVisibility.lazy.log
@@ -127,3 +127,379 @@ LazyJavaPackageFragment@69['lang'] {
     functions('MyJavaClass': Name@85) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
 }
+
+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]
+    <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@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]
+    <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@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
+    <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@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]
+    <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@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]
+    <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@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+    <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@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]
+    <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 }
+    <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@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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
+    <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 {
+    <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@137 {
+    <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@138 {
+    <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@139 {
+    <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@140 {
+    <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@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 {
+    <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 dea760f8e24..18c9cf6c463 100644
--- a/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/privateNestedClassStaticMember.lazy.log
@@ -80,3 +80,65 @@ LazyJavaPackageFragment@36['lang'] {
     classes('javaPackage': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@59
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@59
 }
+
+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]
+    <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]
+}
+
+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]
+    <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 {
+    <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@66 {
+    <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/j+k/protectedStaticSamePackage.lazy.log b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
index cb0b30b4661..a251d2011c2 100644
--- a/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/protectedStaticSamePackage.lazy.log
@@ -67,3 +67,45 @@ LazyJavaPackageFragment@42['test'] {
     classes('JavaClass': Name@51) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@52
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@52
 }
+
+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]
+    <name not found> = EmptyList@7[empty]
+}
+
+ResolutionTaskHolder@61 {
+    <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@62 {
+    <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/j+k/recursiveRawUpperBound.lazy.log b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
index 34a983ab02f..168f9564e9a 100644
--- a/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/recursiveRawUpperBound.lazy.log
@@ -13,94 +13,92 @@ LazyJavaClassDescriptor@4['X'] {
     memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@7
     nestedClassIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@7
     nestedClasses('foo': Name@8) = null // through LazyJavaClassMemberScope@7
-    properties('foo': Name@8) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@15['X']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@14['X']
 }
 
 LazyJavaClassTypeConstructor@3['Bad'] {
-    parameters = ArrayList@16[1] { LazyJavaTypeParameterDescriptor@17['T'] }
+    parameters = ArrayList@15[1] { LazyJavaTypeParameterDescriptor@16['T'] }
 }
 
-LazyJavaClassTypeConstructor@15['X'] {
-    parameters = ArrayList@18[empty]
-    supertypes = ArrayList@19[1] { JetTypeImpl@20['Any'] }
+LazyJavaClassTypeConstructor@14['X'] {
+    parameters = ArrayList@17[empty]
+    supertypes = ArrayList@18[1] { JetTypeImpl@19['Any'] }
 }
 
-LazyJavaClassifierType@21['Bad'] {
-    arguments = ArrayList@22[1] { LazyStarProjection@23 }
-    classifier = JavaClassImpl@24['Bad']
-    nullable = 'false': Boolean@25
+LazyJavaClassifierType@20['Bad'] {
+    arguments = ArrayList@21[1] { LazyStarProjection@22 }
+    classifier = JavaClassImpl@23['Bad']
+    nullable = 'false': Boolean@24
     typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
 }
 
-LazyJavaClassifierType@26['Bad'] {
-    arguments = ArrayList@27[1] { LazyStarProjection@28 }
-    classifier = JavaClassImpl@24['Bad']
-    nullable = 'true': Boolean@29
+LazyJavaClassifierType@25['Bad'] {
+    arguments = ArrayList@26[1] { LazyStarProjection@27 }
+    classifier = JavaClassImpl@23['Bad']
+    nullable = 'true': Boolean@28
     typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
 }
 
-LazyJavaClassifierType@30['Bad'] {
-    arguments = ArrayList@31[1] { TypeProjectionImpl@32 }
-    classifier = JavaClassImpl@33['Bad']
-    nullable = 'false': Boolean@25
+LazyJavaClassifierType@29['Bad'] {
+    arguments = ArrayList@30[1] { TypeProjectionImpl@31 }
+    classifier = JavaClassImpl@32['Bad']
+    nullable = 'false': Boolean@24
     typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
 }
 
-LazyJavaClassifierType@34['Bad'] {
-    arguments = ArrayList@35[1] { TypeProjectionImpl@36 }
-    classifier = JavaClassImpl@33['Bad']
-    nullable = 'true': Boolean@29
+LazyJavaClassifierType@33['Bad'] {
+    arguments = ArrayList@34[1] { TypeProjectionImpl@35 }
+    classifier = JavaClassImpl@32['Bad']
+    nullable = 'true': Boolean@28
     typeConstructor = LazyJavaClassTypeConstructor@3['Bad']
 }
 
-LazyJavaClassifierType@37['Object'] {
-    classifier = JavaClassImpl@38['Object']
-    typeConstructor = DeserializedClassTypeConstructor@39
+LazyJavaClassifierType@36['Object'] {
+    classifier = JavaClassImpl@37['Object']
+    typeConstructor = DeserializedClassTypeConstructor@38
 }
 
-LazyJavaPackageFragmentProvider@40 {
-    packageFragments('<root>': FqName@41) = LazyJavaPackageFragment@42['<root>']
-    packageFragments('X': FqName@43) = null
-    packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
-    packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.X': FqName@48) = null
-    packageFragments('kotlin': FqName@49) = null
-    packageFragments('kotlin.X': FqName@50) = null
-    packageFragments('kotlin.io': FqName@51) = null
-    packageFragments('kotlin.jvm': FqName@52) = null
-    topLevelClasses(JavaClassImpl@24['Bad']) = LazyJavaClassDescriptor@2['Bad']
-    topLevelClasses(JavaClassImpl@53['X']) = LazyJavaClassDescriptor@4['X']
+LazyJavaPackageFragmentProvider@39 {
+    packageFragments('<root>': FqName@40) = LazyJavaPackageFragment@41['<root>']
+    packageFragments('X': FqName@42) = null
+    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
+    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
+    packageFragments('java.lang.X': FqName@47) = null
+    packageFragments('kotlin': FqName@48) = null
+    packageFragments('kotlin.X': FqName@49) = null
+    packageFragments('kotlin.io': FqName@50) = null
+    packageFragments('kotlin.jvm': FqName@51) = null
+    topLevelClasses(JavaClassImpl@23['Bad']) = LazyJavaClassDescriptor@2['Bad']
+    topLevelClasses(JavaClassImpl@52['X']) = LazyJavaClassDescriptor@4['X']
 }
 
-LazyJavaPackageFragment@42['<root>'] {
-    classes('X': Name@54) = LazyJavaClassDescriptor@4['X'] // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('foo': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('foo': Name@8) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
+LazyJavaPackageFragment@41['<root>'] {
+    classes('X': Name@53) = LazyJavaClassDescriptor@4['X'] // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('lang': Name@60) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
+LazyJavaPackageFragment@44['java'] {
+    classes('lang': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('lang': Name@58) = EmptyList@59[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@47['lang'] {
-    classes('foo': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('foo': Name@8) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
+LazyJavaTypeParameterDescriptor@16['T'] {
+    upperBounds = LinkedHashSet@61[1] { DelegatingFlexibleType@62 }
+    upperBoundsAsType = DelegatingFlexibleType@62
 }
 
-LazyJavaTypeParameterDescriptor@17['T'] {
-    upperBounds = LinkedHashSet@64[1] { DelegatingFlexibleType@65 }
-    upperBoundsAsType = DelegatingFlexibleType@65
+LazyJavaTypeParameterResolver@63 {
+    resolve(JavaTypeParameterImpl@64['T']) = LazyJavaTypeParameterDescriptor@16['T']
 }
 
-LazyJavaTypeParameterResolver@66 {
-    resolve(JavaTypeParameterImpl@67['T']) = LazyJavaTypeParameterDescriptor@17['T']
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
index 7b3e5c3e438..aae75d147b9 100644
--- a/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/j+k/samInConstructorWithGenerics.lazy.log
@@ -146,3 +146,9 @@ LazyJavaTypeParameterResolver@103 {
 LazyJavaTypeParameterResolver@105 {
     resolve(JavaTypeParameterImpl@106['T']) = LazyJavaTypeParameterDescriptor@36['T']
 }
+
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <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 04b9c7ee3c3..b1cff802af6 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListAndMap.lazy.log
@@ -5,152 +5,121 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     functions('clear': Name@9) = ArrayList@10[1] { JavaMethodDescriptor@11['clear'] } // through LazyJavaClassMemberScope@5
     functions('get': Name@12) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@5
-    properties('add': Name@15) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    properties('addAll': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    properties('clear': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    properties('get': Name@18) = EmptyList@13[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@21['AbstractList'] {
-    defaultType = JetTypeImpl@22['AbstractList<1>']
-    functions('add': Name@23) = ArrayList@24[2] { JavaMethodDescriptor@25['add'], JavaMethodDescriptor@26['add'] } // through LazyJavaClassMemberScope@27
-    functions('addAll': Name@28) = ArrayList@29[2] { JavaMethodDescriptor@30['addAll'], DeserializedSimpleFunctionDescriptor@31['addAll'] } // through LazyJavaClassMemberScope@27
-    functions('clear': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['clear'] } // through LazyJavaClassMemberScope@27
-    functions('get': Name@35) = ArrayList@36[1] { JavaMethodDescriptor@37['get'] } // through LazyJavaClassMemberScope@27
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@27
-    properties('add': Name@15) = EmptyList@13[empty] // through LazyJavaClassMemberScope@27
-    properties('addAll': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@27
-    properties('clear': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@27
-    properties('get': Name@18) = EmptyList@13[empty] // through LazyJavaClassMemberScope@27
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@39['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@40['AbstractList']
+LazyJavaClassDescriptor@17['AbstractList'] {
+    defaultType = JetTypeImpl@18['AbstractList<1>']
+    functions('add': Name@19) = ArrayList@20[2] { JavaMethodDescriptor@21['add'], JavaMethodDescriptor@22['add'] } // through LazyJavaClassMemberScope@23
+    functions('addAll': Name@24) = ArrayList@25[2] { JavaMethodDescriptor@26['addAll'], DeserializedSimpleFunctionDescriptor@27['addAll'] } // through LazyJavaClassMemberScope@23
+    functions('clear': Name@28) = ArrayList@29[1] { JavaMethodDescriptor@30['clear'] } // through LazyJavaClassMemberScope@23
+    functions('get': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['get'] } // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@23
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
 }
 
-LazyJavaClassDescriptor@41['AbstractMap'] {
-    defaultType = JetTypeImpl@42['AbstractMap<2>']
-    functions('get': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@45['get'] } // through LazyJavaClassMemberScope@46
-    functions('put': Name@47) = ArrayList@48[1] { JavaMethodDescriptor@49['put'] } // through LazyJavaClassMemberScope@46
-    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@46
-    properties('get': Name@51) = EmptyList@13[empty] // through LazyJavaClassMemberScope@46
-    properties('put': Name@52) = EmptyList@13[empty] // through LazyJavaClassMemberScope@46
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@53['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@54['AbstractMap']
+LazyJavaClassDescriptor@37['AbstractMap'] {
+    defaultType = JetTypeImpl@38['AbstractMap<2>']
+    functions('get': Name@39) = ArrayList@40[1] { JavaMethodDescriptor@41['get'] } // through LazyJavaClassMemberScope@42
+    functions('put': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@45['put'] } // through LazyJavaClassMemberScope@42
+    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@42
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@47['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@48['AbstractMap']
 }
 
-LazyJavaClassDescriptor@55['Appendable'] {
-    functions('println': Name@56) = EmptyList@13[empty] // through LazyJavaClassMemberScope@57
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@57
-    properties('println': Name@59) = EmptyList@13[empty] // through LazyJavaClassMemberScope@57
-    typeConstructor = LazyJavaClassTypeConstructor@60['Appendable']
+LazyJavaClassDescriptor@49['Appendable'] {
+    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@51
+    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@51
+    typeConstructor = LazyJavaClassTypeConstructor@53['Appendable']
 }
 
-LazyJavaClassDescriptor@61['ArrayList'] {
-    constructors = ArrayList@62[3] { JavaConstructorDescriptor@63['<init>'], JavaConstructorDescriptor@64['<init>'], JavaConstructorDescriptor@65['<init>'] } // through LazyJavaClassMemberScope@66
-    defaultType = JetTypeImpl@67['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@68 // through LazyJavaClassMemberScope@66
+LazyJavaClassDescriptor@54['ArrayList'] {
+    constructors = ArrayList@55[3] { JavaConstructorDescriptor@56['<init>'], JavaConstructorDescriptor@57['<init>'], JavaConstructorDescriptor@58['<init>'] } // through LazyJavaClassMemberScope@59
+    defaultType = JetTypeImpl@60['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@61 // through LazyJavaClassMemberScope@59
     functionTypeForSamInterface = null
-    functions('add': Name@15) = ArrayList@69[2] { JavaMethodDescriptor@70['add'], JavaMethodDescriptor@71['add'] } // through LazyJavaClassMemberScope@66
-    functions('addAll': Name@16) = ArrayList@72[2] { JavaMethodDescriptor@73['addAll'], JavaMethodDescriptor@74['addAll'] } // through LazyJavaClassMemberScope@66
-    functions('clear': Name@17) = ArrayList@75[1] { JavaMethodDescriptor@76['clear'] } // through LazyJavaClassMemberScope@66
-    functions('get': Name@18) = ArrayList@77[1] { JavaMethodDescriptor@78['get'] } // through LazyJavaClassMemberScope@66
-    memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@66
-    nestedClassIndex = LinkedHashMap@80 // through LazyJavaClassMemberScope@66
-    nestedClasses('add': Name@15) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('addAll': Name@16) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('clear': Name@17) = null // through LazyJavaClassMemberScope@66
-    nestedClasses('get': Name@18) = null // through LazyJavaClassMemberScope@66
-    properties('add': Name@15) = EmptyList@13[empty] // through LazyJavaClassMemberScope@66
-    properties('addAll': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@66
-    properties('clear': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@66
-    properties('get': Name@18) = EmptyList@13[empty] // through LazyJavaClassMemberScope@66
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@81['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@82['ArrayList']
+    functions('add': Name@62) = ArrayList@63[2] { JavaMethodDescriptor@64['add'], JavaMethodDescriptor@65['add'] } // through LazyJavaClassMemberScope@59
+    functions('addAll': Name@66) = ArrayList@67[2] { JavaMethodDescriptor@68['addAll'], JavaMethodDescriptor@69['addAll'] } // through LazyJavaClassMemberScope@59
+    functions('clear': Name@70) = ArrayList@71[1] { JavaMethodDescriptor@72['clear'] } // through LazyJavaClassMemberScope@59
+    functions('get': Name@73) = ArrayList@74[1] { JavaMethodDescriptor@75['get'] } // through LazyJavaClassMemberScope@59
+    memberIndex = computeMemberIndex$1@76 // through LazyJavaClassMemberScope@59
+    nestedClassIndex = LinkedHashMap@77 // through LazyJavaClassMemberScope@59
+    nestedClasses('add': Name@62) = null // through LazyJavaClassMemberScope@59
+    nestedClasses('addAll': Name@66) = null // through LazyJavaClassMemberScope@59
+    nestedClasses('clear': Name@70) = null // through LazyJavaClassMemberScope@59
+    nestedClasses('get': Name@73) = null // through LazyJavaClassMemberScope@59
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@78['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@79['ArrayList']
 }
 
-LazyJavaClassDescriptor@83['AutoCloseable'] {
-    functions('println': Name@56) = EmptyList@13[empty] // through LazyJavaClassMemberScope@84
-    memberIndex = computeMemberIndex$1@85 // through LazyJavaClassMemberScope@84
-    properties('println': Name@59) = EmptyList@13[empty] // through LazyJavaClassMemberScope@84
-    typeConstructor = LazyJavaClassTypeConstructor@86['AutoCloseable']
+LazyJavaClassDescriptor@80['AutoCloseable'] {
+    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@81
+    memberIndex = computeMemberIndex$1@82 // through LazyJavaClassMemberScope@81
+    typeConstructor = LazyJavaClassTypeConstructor@83['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@87['Closeable'] {
-    functions('println': Name@56) = EmptyList@13[empty] // through LazyJavaClassMemberScope@88
-    memberIndex = computeMemberIndex$1@89 // through LazyJavaClassMemberScope@88
-    properties('println': Name@59) = EmptyList@13[empty] // through LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@90['Closeable']
+LazyJavaClassDescriptor@84['Closeable'] {
+    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@85
+    memberIndex = computeMemberIndex$1@86 // through LazyJavaClassMemberScope@85
+    typeConstructor = LazyJavaClassTypeConstructor@87['Closeable']
 }
 
-LazyJavaClassDescriptor@91['FilterOutputStream'] {
-    functions('println': Name@56) = EmptyList@13[empty] // through LazyJavaClassMemberScope@92
-    memberIndex = computeMemberIndex$1@93 // through LazyJavaClassMemberScope@92
-    properties('println': Name@59) = EmptyList@13[empty] // through LazyJavaClassMemberScope@92
-    typeConstructor = LazyJavaClassTypeConstructor@94['FilterOutputStream']
+LazyJavaClassDescriptor@88['FilterOutputStream'] {
+    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@89
+    memberIndex = computeMemberIndex$1@90 // through LazyJavaClassMemberScope@89
+    typeConstructor = LazyJavaClassTypeConstructor@91['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@95['HashMap'] {
-    constructors = ArrayList@96[4] { JavaConstructorDescriptor@97['<init>'], JavaConstructorDescriptor@98['<init>'], JavaConstructorDescriptor@99['<init>'], ... } // through LazyJavaClassMemberScope@100
-    defaultType = JetTypeImpl@101['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@102 // through LazyJavaClassMemberScope@100
+LazyJavaClassDescriptor@92['HashMap'] {
+    constructors = ArrayList@93[4] { JavaConstructorDescriptor@94['<init>'], JavaConstructorDescriptor@95['<init>'], JavaConstructorDescriptor@96['<init>'], ... } // through LazyJavaClassMemberScope@97
+    defaultType = JetTypeImpl@98['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@99 // through LazyJavaClassMemberScope@97
     functionTypeForSamInterface = null
-    functions('get': Name@51) = ArrayList@103[1] { JavaMethodDescriptor@104['get'] } // through LazyJavaClassMemberScope@100
-    functions('put': Name@52) = ArrayList@105[1] { JavaMethodDescriptor@106['put'] } // through LazyJavaClassMemberScope@100
-    memberIndex = computeMemberIndex$1@107 // through LazyJavaClassMemberScope@100
-    nestedClassIndex = LinkedHashMap@108 // through LazyJavaClassMemberScope@100
-    nestedClasses('get': Name@51) = null // through LazyJavaClassMemberScope@100
-    nestedClasses('put': Name@52) = null // through LazyJavaClassMemberScope@100
-    properties('get': Name@51) = EmptyList@13[empty] // through LazyJavaClassMemberScope@100
-    properties('put': Name@52) = EmptyList@13[empty] // through LazyJavaClassMemberScope@100
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@109['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@110['HashMap']
+    functions('get': Name@100) = ArrayList@101[1] { JavaMethodDescriptor@102['get'] } // through LazyJavaClassMemberScope@97
+    functions('put': Name@103) = ArrayList@104[1] { JavaMethodDescriptor@105['put'] } // through LazyJavaClassMemberScope@97
+    memberIndex = computeMemberIndex$1@106 // through LazyJavaClassMemberScope@97
+    nestedClassIndex = LinkedHashMap@107 // through LazyJavaClassMemberScope@97
+    nestedClasses('get': Name@100) = null // through LazyJavaClassMemberScope@97
+    nestedClasses('put': Name@103) = null // through LazyJavaClassMemberScope@97
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@108['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@109['HashMap']
 }
 
-LazyJavaClassDescriptor@111['OutputStream'] {
-    functions('println': Name@56) = EmptyList@13[empty] // through LazyJavaClassMemberScope@112
-    memberIndex = computeMemberIndex$1@113 // through LazyJavaClassMemberScope@112
-    properties('println': Name@59) = EmptyList@13[empty] // through LazyJavaClassMemberScope@112
-    typeConstructor = LazyJavaClassTypeConstructor@114['OutputStream']
+LazyJavaClassDescriptor@110['OutputStream'] {
+    functions('println': Name@50) = EmptyList@13[empty] // through LazyJavaClassMemberScope@111
+    memberIndex = computeMemberIndex$1@112 // through LazyJavaClassMemberScope@111
+    typeConstructor = LazyJavaClassTypeConstructor@113['OutputStream']
 }
 
-LazyJavaClassDescriptor@115['PrintStream'] {
-    defaultType = JetTypeImpl@116['PrintStream']
-    enumEntryIndex = LinkedHashMap@117 // through LazyJavaClassMemberScope@118
-    functions('println': Name@59) = ArrayList@119[10] { JavaMethodDescriptor@120['println'], JavaMethodDescriptor@121['println'], JavaMethodDescriptor@122['println'], ... } // through LazyJavaClassMemberScope@118
-    memberIndex = computeMemberIndex$1@123 // through LazyJavaClassMemberScope@118
-    nestedClassIndex = LinkedHashMap@124 // through LazyJavaClassMemberScope@118
-    nestedClasses('println': Name@59) = null // through LazyJavaClassMemberScope@118
-    properties('println': Name@59) = EmptyList@13[empty] // through LazyJavaClassMemberScope@118
+LazyJavaClassDescriptor@114['PrintStream'] {
+    defaultType = JetTypeImpl@115['PrintStream']
+    enumEntryIndex = LinkedHashMap@116 // through LazyJavaClassMemberScope@117
+    functions('println': Name@118) = ArrayList@119[10] { JavaMethodDescriptor@120['println'], JavaMethodDescriptor@121['println'], JavaMethodDescriptor@122['println'], ... } // through LazyJavaClassMemberScope@117
+    memberIndex = computeMemberIndex$1@123 // through LazyJavaClassMemberScope@117
+    nestedClassIndex = LinkedHashMap@124 // through LazyJavaClassMemberScope@117
+    nestedClasses('println': Name@118) = null // through LazyJavaClassMemberScope@117
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@125['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@126['PrintStream']
 }
 
 LazyJavaClassDescriptor@127['RandomAccess'] {
-    functions('add': Name@23) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    functions('addAll': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    functions('clear': Name@32) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    functions('get': Name@35) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
+    functions('add': Name@19) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
+    functions('addAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
+    functions('clear': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
+    functions('get': Name@31) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
     memberIndex = computeMemberIndex$1@129 // through LazyJavaClassMemberScope@128
-    properties('add': Name@15) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    properties('addAll': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    properties('clear': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
-    properties('get': Name@18) = EmptyList@13[empty] // through LazyJavaClassMemberScope@128
     typeConstructor = LazyJavaClassTypeConstructor@130['RandomAccess']
 }
 
 LazyJavaClassDescriptor@131['Serializable'] {
-    functions('add': Name@23) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('addAll': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('clear': Name@32) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('get': Name@35) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    functions('put': Name@47) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
+    functions('add': Name@19) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
+    functions('addAll': Name@24) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
+    functions('clear': Name@28) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
+    functions('get': Name@31) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
+    functions('put': Name@43) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
     memberIndex = computeMemberIndex$1@133 // through LazyJavaClassMemberScope@132
-    properties('add': Name@15) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    properties('addAll': Name@16) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    properties('clear': Name@17) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    properties('get': Name@18) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
-    properties('put': Name@52) = EmptyList@13[empty] // through LazyJavaClassMemberScope@132
     typeConstructor = LazyJavaClassTypeConstructor@134['Serializable']
 }
 
@@ -165,52 +134,52 @@ LazyJavaClassDescriptor@135['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@145['System']
 }
 
-LazyJavaClassTypeConstructor@20['AbstractCollection'] {
+LazyJavaClassTypeConstructor@16['AbstractCollection'] {
     parameters = ArrayList@146[1] { LazyJavaTypeParameterDescriptor@147['E'] }
     supertypes = ArrayList@148[1] { LazyJavaClassifierType@149['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@40['AbstractList'] {
+LazyJavaClassTypeConstructor@36['AbstractList'] {
     parameters = ArrayList@150[1] { LazyJavaTypeParameterDescriptor@151['E'] }
     supertypes = ArrayList@152[2] { LazyJavaClassifierType@153['AbstractCollection<E>'], LazyJavaClassifierType@154['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@54['AbstractMap'] {
+LazyJavaClassTypeConstructor@48['AbstractMap'] {
     parameters = ArrayList@155[2] { LazyJavaTypeParameterDescriptor@156['K'], LazyJavaTypeParameterDescriptor@157['V'] }
     supertypes = ArrayList@158[1] { LazyJavaClassifierType@159['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@60['Appendable'] {
+LazyJavaClassTypeConstructor@53['Appendable'] {
     parameters = ArrayList@160[empty]
     supertypes = ArrayList@161[1] { JetTypeImpl@162['Any'] }
 }
 
-LazyJavaClassTypeConstructor@82['ArrayList'] {
+LazyJavaClassTypeConstructor@79['ArrayList'] {
     parameters = ArrayList@163[1] { LazyJavaTypeParameterDescriptor@164['E'] }
     supertypes = ArrayList@165[5] { LazyJavaClassifierType@166['AbstractList<E>'], LazyJavaClassifierType@167['List<E>'], LazyJavaClassifierType@168['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@86['AutoCloseable'] {
+LazyJavaClassTypeConstructor@83['AutoCloseable'] {
     parameters = ArrayList@169[empty]
     supertypes = ArrayList@170[1] { JetTypeImpl@162['Any'] }
 }
 
-LazyJavaClassTypeConstructor@90['Closeable'] {
+LazyJavaClassTypeConstructor@87['Closeable'] {
     parameters = ArrayList@171[empty]
     supertypes = ArrayList@172[1] { LazyJavaClassifierType@173['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@94['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@91['FilterOutputStream'] {
     parameters = ArrayList@174[empty]
     supertypes = ArrayList@175[1] { LazyJavaClassifierType@176['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@110['HashMap'] {
+LazyJavaClassTypeConstructor@109['HashMap'] {
     parameters = ArrayList@177[2] { LazyJavaTypeParameterDescriptor@178['K'], LazyJavaTypeParameterDescriptor@179['V'] }
     supertypes = ArrayList@180[4] { LazyJavaClassifierType@181['AbstractMap<K, V>'], LazyJavaClassifierType@182['Map<K, V>'], LazyJavaClassifierType@183['Cloneable'], ... }
 }
 
-LazyJavaClassTypeConstructor@114['OutputStream'] {
+LazyJavaClassTypeConstructor@113['OutputStream'] {
     parameters = ArrayList@184[empty]
     supertypes = ArrayList@185[1] { LazyJavaClassifierType@186['Closeable'] }
 }
@@ -239,35 +208,35 @@ LazyJavaClassifierType@153['AbstractCollection<E>'] {
     classifier = JavaClassImpl@199['AbstractCollection']
     memberScope = SubstitutingScope@200
     nullable = 'false': Boolean@201
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
 }
 
 LazyJavaClassifierType@166['AbstractList<E>'] {
     arguments = ArrayList@202[1] { TypeProjectionImpl@203 }
     classifier = JavaClassImpl@204['AbstractList']
     memberScope = SubstitutingScope@205
-    typeConstructor = LazyJavaClassTypeConstructor@40['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@36['AbstractList']
 }
 
 LazyJavaClassifierType@181['AbstractMap<K, V>'] {
     arguments = ArrayList@206[2] { TypeProjectionImpl@207, TypeProjectionImpl@208 }
     classifier = JavaClassImpl@209['AbstractMap']
     memberScope = SubstitutingScope@210
-    typeConstructor = LazyJavaClassTypeConstructor@54['AbstractMap']
+    typeConstructor = LazyJavaClassTypeConstructor@48['AbstractMap']
 }
 
 LazyJavaClassifierType@190['Appendable'] {
     arguments = ArrayList@211[empty]
     classifier = JavaClassImpl@212['Appendable']
-    memberScope = LazyJavaClassMemberScope@57
-    typeConstructor = LazyJavaClassTypeConstructor@60['Appendable']
+    memberScope = LazyJavaClassMemberScope@51
+    typeConstructor = LazyJavaClassTypeConstructor@53['Appendable']
 }
 
 LazyJavaClassifierType@173['AutoCloseable'] {
     arguments = ArrayList@213[empty]
     classifier = JavaClassImpl@214['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@84
-    typeConstructor = LazyJavaClassTypeConstructor@86['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@81
+    typeConstructor = LazyJavaClassTypeConstructor@83['AutoCloseable']
 }
 
 LazyJavaClassifierType@183['Cloneable'] {
@@ -284,18 +253,18 @@ LazyJavaClassifierType@219['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@218
 }
 
-LazyJavaClassifierType@186['Closeable'] {
+LazyJavaClassifierType@191['Closeable'] {
     arguments = ArrayList@222[empty]
     classifier = JavaClassImpl@223['Closeable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@90['Closeable']
+    memberScope = LazyJavaClassMemberScope@85
+    typeConstructor = LazyJavaClassTypeConstructor@87['Closeable']
 }
 
-LazyJavaClassifierType@191['Closeable'] {
+LazyJavaClassifierType@186['Closeable'] {
     arguments = ArrayList@224[empty]
     classifier = JavaClassImpl@225['Closeable']
-    memberScope = LazyJavaClassMemberScope@88
-    typeConstructor = LazyJavaClassTypeConstructor@90['Closeable']
+    memberScope = LazyJavaClassMemberScope@85
+    typeConstructor = LazyJavaClassTypeConstructor@87['Closeable']
 }
 
 LazyJavaClassifierType@226['Collection<? extends E>'] {
@@ -340,7 +309,7 @@ LazyJavaClassifierType@247['Collection<? extends E>'] {
 
 LazyJavaClassifierType@252['Collection<? extends E>'] {
     arguments = ArrayList@253[1] { TypeProjectionImpl@254 }
-    classifier = JavaClassImpl@250['Collection']
+    classifier = JavaClassImpl@245['Collection']
     memberScope = SubstitutingScope@255
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -348,7 +317,7 @@ LazyJavaClassifierType@252['Collection<? extends E>'] {
 
 LazyJavaClassifierType@258['Collection<? extends E>'] {
     arguments = ArrayList@259[1] { TypeProjectionImpl@260 }
-    classifier = JavaClassImpl@245['Collection']
+    classifier = JavaClassImpl@240['Collection']
     memberScope = SubstitutingScope@261
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -356,7 +325,7 @@ LazyJavaClassifierType@258['Collection<? extends E>'] {
 
 LazyJavaClassifierType@262['Collection<? extends E>'] {
     arguments = ArrayList@263[1] { TypeProjectionImpl@264 }
-    classifier = JavaClassImpl@240['Collection']
+    classifier = JavaClassImpl@250['Collection']
     memberScope = SubstitutingScope@265
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -364,7 +333,7 @@ LazyJavaClassifierType@262['Collection<? extends E>'] {
 
 LazyJavaClassifierType@266['Collection<? extends E>'] {
     arguments = ArrayList@267[1] { TypeProjectionImpl@268 }
-    classifier = JavaClassImpl@229['Collection']
+    classifier = JavaClassImpl@235['Collection']
     memberScope = SubstitutingScope@269
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -372,7 +341,7 @@ LazyJavaClassifierType@266['Collection<? extends E>'] {
 
 LazyJavaClassifierType@270['Collection<? extends E>'] {
     arguments = ArrayList@271[1] { TypeProjectionImpl@272 }
-    classifier = JavaClassImpl@235['Collection']
+    classifier = JavaClassImpl@229['Collection']
     memberScope = SubstitutingScope@273
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@257
@@ -396,70 +365,70 @@ LazyJavaClassifierType@282['E'] {
     arguments = ArrayList@283[empty]
     classifier = JavaTypeParameterImpl@284['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
-LazyJavaClassifierType@285['E'] {
-    arguments = ArrayList@286[empty]
-    classifier = JavaTypeParameterImpl@287['E']
+LazyJavaClassifierType@286['E'] {
+    arguments = ArrayList@287[empty]
+    classifier = JavaTypeParameterImpl@288['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@289['E'] {
     arguments = ArrayList@290[empty]
     classifier = JavaTypeParameterImpl@291['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@292['E'] {
     arguments = ArrayList@293[empty]
     classifier = JavaTypeParameterImpl@294['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
-LazyJavaClassifierType@295['E'] {
-    arguments = ArrayList@296[empty]
-    classifier = JavaTypeParameterImpl@297['E']
+LazyJavaClassifierType@296['E'] {
+    arguments = ArrayList@297[empty]
+    classifier = JavaTypeParameterImpl@298['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
-LazyJavaClassifierType@298['E'] {
-    arguments = ArrayList@299[empty]
-    classifier = JavaTypeParameterImpl@300['E']
+LazyJavaClassifierType@299['E'] {
+    arguments = ArrayList@300[empty]
+    classifier = JavaTypeParameterImpl@301['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
-LazyJavaClassifierType@301['E'] {
-    arguments = ArrayList@302[empty]
-    classifier = JavaTypeParameterImpl@303['E']
+LazyJavaClassifierType@302['E'] {
+    arguments = ArrayList@303[empty]
+    classifier = JavaTypeParameterImpl@304['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
-LazyJavaClassifierType@304['E'] {
-    arguments = ArrayList@305[empty]
-    classifier = JavaTypeParameterImpl@306['E']
+LazyJavaClassifierType@305['E'] {
+    arguments = ArrayList@306[empty]
+    classifier = JavaTypeParameterImpl@307['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
-LazyJavaClassifierType@307['E'] {
-    arguments = ArrayList@308[empty]
-    classifier = JavaTypeParameterImpl@309['E']
+LazyJavaClassifierType@308['E'] {
+    arguments = ArrayList@309[empty]
+    classifier = JavaTypeParameterImpl@310['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
 LazyJavaClassifierType@311['E'] {
     arguments = ArrayList@312[empty]
     classifier = JavaTypeParameterImpl@313['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@314['E'] {
@@ -473,7 +442,7 @@ LazyJavaClassifierType@317['E'] {
     arguments = ArrayList@318[empty]
     classifier = JavaTypeParameterImpl@319['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@320['E'] {
@@ -487,42 +456,42 @@ LazyJavaClassifierType@323['E'] {
     arguments = ArrayList@324[empty]
     classifier = JavaTypeParameterImpl@325['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@326['E'] {
     arguments = ArrayList@327[empty]
     classifier = JavaTypeParameterImpl@328['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@329['E'] {
     arguments = ArrayList@330[empty]
     classifier = JavaTypeParameterImpl@331['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
 LazyJavaClassifierType@332['E'] {
     arguments = ArrayList@333[empty]
     classifier = JavaTypeParameterImpl@334['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@335['E'] {
     arguments = ArrayList@336[empty]
     classifier = JavaTypeParameterImpl@337['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@338['E'] {
     arguments = ArrayList@339[empty]
     classifier = JavaTypeParameterImpl@340['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@341['E'] {
@@ -536,159 +505,159 @@ LazyJavaClassifierType@344['E'] {
     arguments = ArrayList@345[empty]
     classifier = JavaTypeParameterImpl@346['E']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@347['E'] {
     arguments = ArrayList@348[empty]
-    classifier = JavaTypeParameterImpl@340['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
-}
-
-LazyJavaClassifierType@349['E'] {
-    arguments = ArrayList@350[empty]
-    classifier = JavaTypeParameterImpl@284['E']
+    classifier = JavaTypeParameterImpl@343['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
+LazyJavaClassifierType@349['E'] {
+    arguments = ArrayList@350[empty]
+    classifier = JavaTypeParameterImpl@307['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+}
+
 LazyJavaClassifierType@351['E'] {
     arguments = ArrayList@352[empty]
-    classifier = JavaTypeParameterImpl@309['E']
+    classifier = JavaTypeParameterImpl@328['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
 }
 
 LazyJavaClassifierType@353['E'] {
     arguments = ArrayList@354[empty]
-    classifier = JavaTypeParameterImpl@337['E']
+    classifier = JavaTypeParameterImpl@325['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    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@357['E'] {
-    arguments = ArrayList@358[empty]
-    classifier = JavaTypeParameterImpl@334['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
-}
-
 LazyJavaClassifierType@359['E'] {
     arguments = ArrayList@360[empty]
-    classifier = JavaTypeParameterImpl@313['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
-}
-
-LazyJavaClassifierType@361['E'] {
-    arguments = ArrayList@362[empty]
-    classifier = JavaTypeParameterImpl@280['E']
+    classifier = JavaTypeParameterImpl@340['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
+LazyJavaClassifierType@361['E'] {
+    arguments = ArrayList@362[empty]
+    classifier = JavaTypeParameterImpl@331['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+}
+
 LazyJavaClassifierType@363['E'] {
     arguments = ArrayList@364[empty]
-    classifier = JavaTypeParameterImpl@287['E']
+    classifier = JavaTypeParameterImpl@291['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@365['E'] {
     arguments = ArrayList@366[empty]
-    classifier = JavaTypeParameterImpl@294['E']
+    classifier = JavaTypeParameterImpl@313['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@367['E'] {
     arguments = ArrayList@368[empty]
-    classifier = JavaTypeParameterImpl@346['E']
+    classifier = JavaTypeParameterImpl@304['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
 LazyJavaClassifierType@369['E'] {
     arguments = ArrayList@370[empty]
-    classifier = JavaTypeParameterImpl@331['E']
+    classifier = JavaTypeParameterImpl@334['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@371['E'] {
     arguments = ArrayList@372[empty]
-    classifier = JavaTypeParameterImpl@319['E']
+    classifier = JavaTypeParameterImpl@310['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
 LazyJavaClassifierType@373['E'] {
     arguments = ArrayList@374[empty]
-    classifier = JavaTypeParameterImpl@303['E']
+    classifier = JavaTypeParameterImpl@280['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@375['E'] {
     arguments = ArrayList@376[empty]
-    classifier = JavaTypeParameterImpl@306['E']
+    classifier = JavaTypeParameterImpl@346['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@377['E'] {
     arguments = ArrayList@378[empty]
+    classifier = JavaTypeParameterImpl@284['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+}
+
+LazyJavaClassifierType@379['E'] {
+    arguments = ArrayList@380[empty]
+    classifier = JavaTypeParameterImpl@319['E']
+    nullable = 'true': Boolean@256
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
+}
+
+LazyJavaClassifierType@381['E'] {
+    arguments = ArrayList@382[empty]
     classifier = JavaTypeParameterImpl@322['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
-LazyJavaClassifierType@379['E'] {
-    arguments = ArrayList@380[empty]
-    classifier = JavaTypeParameterImpl@300['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
-}
-
-LazyJavaClassifierType@381['E'] {
-    arguments = ArrayList@382[empty]
-    classifier = JavaTypeParameterImpl@291['E']
-    nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
-}
-
 LazyJavaClassifierType@383['E'] {
     arguments = ArrayList@384[empty]
-    classifier = JavaTypeParameterImpl@297['E']
+    classifier = JavaTypeParameterImpl@298['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
 LazyJavaClassifierType@385['E'] {
     arguments = ArrayList@386[empty]
-    classifier = JavaTypeParameterImpl@325['E']
+    classifier = JavaTypeParameterImpl@301['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
 }
 
 LazyJavaClassifierType@387['E'] {
     arguments = ArrayList@388[empty]
-    classifier = JavaTypeParameterImpl@328['E']
+    classifier = JavaTypeParameterImpl@337['E']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
 
 LazyJavaClassifierType@389['E'] {
     arguments = ArrayList@390[empty]
-    classifier = JavaTypeParameterImpl@343['E']
+    classifier = JavaTypeParameterImpl@288['E']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
 }
@@ -696,8 +665,8 @@ LazyJavaClassifierType@389['E'] {
 LazyJavaClassifierType@189['FilterOutputStream'] {
     arguments = ArrayList@391[empty]
     classifier = JavaClassImpl@392['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@92
-    typeConstructor = LazyJavaClassTypeConstructor@94['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@89
+    typeConstructor = LazyJavaClassTypeConstructor@91['FilterOutputStream']
 }
 
 LazyJavaClassifierType@393['Flushable'] {
@@ -730,14 +699,14 @@ LazyJavaClassifierType@406['K'] {
     arguments = ArrayList@407[empty]
     classifier = JavaTypeParameterImpl@408['K']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@409['K'] {
     arguments = ArrayList@410[empty]
     classifier = JavaTypeParameterImpl@411['K']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@412['K'] {
@@ -751,14 +720,14 @@ LazyJavaClassifierType@415['K'] {
     arguments = ArrayList@416[empty]
     classifier = JavaTypeParameterImpl@417['K']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@418['K'] {
     arguments = ArrayList@419[empty]
-    classifier = JavaTypeParameterImpl@401['K']
+    classifier = JavaTypeParameterImpl@414['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@420['K'] {
@@ -770,7 +739,7 @@ LazyJavaClassifierType@420['K'] {
 
 LazyJavaClassifierType@422['K'] {
     arguments = ArrayList@423[empty]
-    classifier = JavaTypeParameterImpl@397['K']
+    classifier = JavaTypeParameterImpl@408['K']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
@@ -779,28 +748,28 @@ LazyJavaClassifierType@424['K'] {
     arguments = ArrayList@425[empty]
     classifier = JavaTypeParameterImpl@411['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@426['K'] {
     arguments = ArrayList@427[empty]
-    classifier = JavaTypeParameterImpl@408['K']
+    classifier = JavaTypeParameterImpl@397['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@428['K'] {
     arguments = ArrayList@429[empty]
     classifier = JavaTypeParameterImpl@417['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
 }
 
 LazyJavaClassifierType@430['K'] {
     arguments = ArrayList@431[empty]
-    classifier = JavaTypeParameterImpl@414['K']
+    classifier = JavaTypeParameterImpl@401['K']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
 }
 
 LazyJavaClassifierType@154['List<E>'] {
@@ -834,14 +803,14 @@ LazyJavaClassifierType@448['Map<? extends K, ? extends V>'] {
     typeConstructor = DeserializedClassTypeConstructor@453
 }
 
-LazyJavaClassifierType@159['Map<K, V>'] {
+LazyJavaClassifierType@182['Map<K, V>'] {
     arguments = ArrayList@454[2] { TypeProjectionImpl@455, TypeProjectionImpl@456 }
     classifier = JavaClassImpl@457['Map']
     memberScope = SubstitutingScope@458
     typeConstructor = DeserializedClassTypeConstructor@447
 }
 
-LazyJavaClassifierType@182['Map<K, V>'] {
+LazyJavaClassifierType@159['Map<K, V>'] {
     arguments = ArrayList@459[2] { TypeProjectionImpl@460, TypeProjectionImpl@461 }
     classifier = JavaClassImpl@462['Map']
     memberScope = SubstitutingScope@463
@@ -866,7 +835,7 @@ LazyJavaClassifierType@469['Object'] {
 
 LazyJavaClassifierType@472['Object'] {
     arguments = ArrayList@473[empty]
-    classifier = JavaClassImpl@466['Object']
+    classifier = JavaClassImpl@471['Object']
     memberScope = DeserializedClassMemberScope@467
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@468
@@ -874,7 +843,7 @@ LazyJavaClassifierType@472['Object'] {
 
 LazyJavaClassifierType@474['Object'] {
     arguments = ArrayList@475[empty]
-    classifier = JavaClassImpl@471['Object']
+    classifier = JavaClassImpl@466['Object']
     memberScope = DeserializedClassMemberScope@467
     nullable = 'true': Boolean@256
     typeConstructor = DeserializedClassTypeConstructor@468
@@ -937,14 +906,14 @@ LazyJavaClassifierType@495['Object'] {
 LazyJavaClassifierType@176['OutputStream'] {
     arguments = ArrayList@497[empty]
     classifier = JavaClassImpl@498['OutputStream']
-    memberScope = LazyJavaClassMemberScope@112
-    typeConstructor = LazyJavaClassTypeConstructor@114['OutputStream']
+    memberScope = LazyJavaClassMemberScope@111
+    typeConstructor = LazyJavaClassTypeConstructor@113['OutputStream']
 }
 
 LazyJavaClassifierType@499['PrintStream'] {
     arguments = ArrayList@500[empty]
     classifier = JavaClassImpl@501['PrintStream']
-    memberScope = LazyJavaClassMemberScope@118
+    memberScope = LazyJavaClassMemberScope@117
     nullable = 'false': Boolean@201
     typeConstructor = LazyJavaClassTypeConstructor@126['PrintStream']
 }
@@ -1003,42 +972,42 @@ LazyJavaClassifierType@522['V'] {
     arguments = ArrayList@523[empty]
     classifier = JavaTypeParameterImpl@524['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
 }
 
-LazyJavaClassifierType@525['V'] {
-    arguments = ArrayList@526[empty]
-    classifier = JavaTypeParameterImpl@527['V']
+LazyJavaClassifierType@526['V'] {
+    arguments = ArrayList@527[empty]
+    classifier = JavaTypeParameterImpl@528['V']
+    nullable = 'false': Boolean@201
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+}
+
+LazyJavaClassifierType@529['V'] {
+    arguments = ArrayList@530[empty]
+    classifier = JavaTypeParameterImpl@531['V']
     nullable = 'false': Boolean@201
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
-LazyJavaClassifierType@528['V'] {
-    arguments = ArrayList@529[empty]
-    classifier = JavaTypeParameterImpl@530['V']
+LazyJavaClassifierType@532['V'] {
+    arguments = ArrayList@533[empty]
+    classifier = JavaTypeParameterImpl@534['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-}
-
-LazyJavaClassifierType@531['V'] {
-    arguments = ArrayList@532[empty]
-    classifier = JavaTypeParameterImpl@533['V']
-    nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
 }
 
 LazyJavaClassifierType@535['V'] {
     arguments = ArrayList@536[empty]
     classifier = JavaTypeParameterImpl@537['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@538['V'] {
     arguments = ArrayList@539[empty]
     classifier = JavaTypeParameterImpl@540['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
 }
 
 LazyJavaClassifierType@541['V'] {
@@ -1059,7 +1028,7 @@ LazyJavaClassifierType@547['V'] {
     arguments = ArrayList@548[empty]
     classifier = JavaTypeParameterImpl@549['V']
     nullable = 'false': Boolean@201
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@550['V'] {
@@ -1071,77 +1040,77 @@ LazyJavaClassifierType@550['V'] {
 
 LazyJavaClassifierType@553['V'] {
     arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@524['V']
+    classifier = JavaTypeParameterImpl@528['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
 }
 
 LazyJavaClassifierType@555['V'] {
     arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@540['V']
+    classifier = JavaTypeParameterImpl@534['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
 }
 
 LazyJavaClassifierType@557['V'] {
     arguments = ArrayList@558[empty]
-    classifier = JavaTypeParameterImpl@543['V']
+    classifier = JavaTypeParameterImpl@520['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@559['V'] {
     arguments = ArrayList@560[empty]
-    classifier = JavaTypeParameterImpl@549['V']
+    classifier = JavaTypeParameterImpl@543['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@561['V'] {
     arguments = ArrayList@562[empty]
-    classifier = JavaTypeParameterImpl@552['V']
+    classifier = JavaTypeParameterImpl@546['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@563['V'] {
     arguments = ArrayList@564[empty]
-    classifier = JavaTypeParameterImpl@537['V']
+    classifier = JavaTypeParameterImpl@524['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
 }
 
 LazyJavaClassifierType@565['V'] {
     arguments = ArrayList@566[empty]
-    classifier = JavaTypeParameterImpl@527['V']
+    classifier = JavaTypeParameterImpl@531['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@567['V'] {
     arguments = ArrayList@568[empty]
-    classifier = JavaTypeParameterImpl@533['V']
+    classifier = JavaTypeParameterImpl@552['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@569['V'] {
     arguments = ArrayList@570[empty]
-    classifier = JavaTypeParameterImpl@530['V']
+    classifier = JavaTypeParameterImpl@549['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@571['V'] {
     arguments = ArrayList@572[empty]
-    classifier = JavaTypeParameterImpl@520['V']
+    classifier = JavaTypeParameterImpl@540['V']
     nullable = 'true': Boolean@256
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
 }
 
 LazyJavaClassifierType@573['V'] {
     arguments = ArrayList@574[empty]
-    classifier = JavaTypeParameterImpl@546['V']
+    classifier = JavaTypeParameterImpl@537['V']
     nullable = 'true': Boolean@256
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
@@ -1207,18 +1176,18 @@ LazyJavaPackageFragmentProvider@575 {
     packageFragments('kotlin1.System': FqName@638) = null
     packageFragments('kotlin1.Unit': FqName@639) = null
     topLevelClasses(JavaClassImpl@199['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@204['AbstractList']) = LazyJavaClassDescriptor@21['AbstractList']
-    topLevelClasses(JavaClassImpl@209['AbstractMap']) = LazyJavaClassDescriptor@41['AbstractMap']
-    topLevelClasses(JavaClassImpl@212['Appendable']) = LazyJavaClassDescriptor@55['Appendable']
-    topLevelClasses(JavaClassImpl@640['ArrayList']) = LazyJavaClassDescriptor@61['ArrayList']
-    topLevelClasses(JavaClassImpl@214['AutoCloseable']) = LazyJavaClassDescriptor@83['AutoCloseable']
-    topLevelClasses(JavaClassImpl@225['Closeable']) = LazyJavaClassDescriptor@87['Closeable']
-    topLevelClasses(JavaClassImpl@392['FilterOutputStream']) = LazyJavaClassDescriptor@91['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@641['HashMap']) = LazyJavaClassDescriptor@95['HashMap']
+    topLevelClasses(JavaClassImpl@204['AbstractList']) = LazyJavaClassDescriptor@17['AbstractList']
+    topLevelClasses(JavaClassImpl@209['AbstractMap']) = LazyJavaClassDescriptor@37['AbstractMap']
+    topLevelClasses(JavaClassImpl@212['Appendable']) = LazyJavaClassDescriptor@49['Appendable']
+    topLevelClasses(JavaClassImpl@640['ArrayList']) = LazyJavaClassDescriptor@54['ArrayList']
+    topLevelClasses(JavaClassImpl@214['AutoCloseable']) = LazyJavaClassDescriptor@80['AutoCloseable']
+    topLevelClasses(JavaClassImpl@223['Closeable']) = LazyJavaClassDescriptor@84['Closeable']
+    topLevelClasses(JavaClassImpl@392['FilterOutputStream']) = LazyJavaClassDescriptor@88['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@641['HashMap']) = LazyJavaClassDescriptor@92['HashMap']
     topLevelClasses(JavaClassImpl@642['List']) = LazyJavaClassDescriptor@643['List']
     topLevelClasses(JavaClassImpl@644['Map']) = LazyJavaClassDescriptor@645['Map']
-    topLevelClasses(JavaClassImpl@498['OutputStream']) = LazyJavaClassDescriptor@111['OutputStream']
-    topLevelClasses(JavaClassImpl@501['PrintStream']) = LazyJavaClassDescriptor@115['PrintStream']
+    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@646['System']) = LazyJavaClassDescriptor@135['System']
@@ -1237,195 +1206,434 @@ LazyJavaPackageFragment@593['lang'] {
     classes('ArrayList': Name@654) = null // through LazyPackageFragmentScopeForJavaPackage@655
     classes('HashMap': Name@656) = null // through LazyPackageFragmentScopeForJavaPackage@655
     classes('System': Name@657) = LazyJavaClassDescriptor@135['System'] // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('add': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('addAll': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('clear': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@655
     classes('equals': Name@658) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('get': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('plus': Name@659) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('println': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('put': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@655
-    classes('test': Name@660) = null // through LazyPackageFragmentScopeForJavaPackage@655
+    classes('test': Name@659) = null // through LazyPackageFragmentScopeForJavaPackage@655
     deserializedPackageScope = Empty@650 // through LazyPackageFragmentScopeForJavaPackage@655
     functions('ArrayList': Name@654) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
     functions('HashMap': Name@656) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('add': Name@15) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('addAll': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('clear': Name@17) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
     functions('equals': Name@658) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('get': Name@18) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('plus': Name@659) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('println': Name@59) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('put': Name@52) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    functions('test': Name@660) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
-    memberIndex = computeMemberIndex$1@661 // through LazyPackageFragmentScopeForJavaPackage@655
+    functions('test': Name@659) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@655
+    memberIndex = computeMemberIndex$1@660 // through LazyPackageFragmentScopeForJavaPackage@655
 }
 
 LazyJavaPackageFragment@605['util'] {
-    classes('Array': Name@662) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('ArrayList': Name@664) = LazyJavaClassDescriptor@61['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('Boolean': Name@665) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('HashMap': Name@656) = LazyJavaClassDescriptor@95['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('Int': Name@666) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('List': Name@667) = LazyJavaClassDescriptor@643['List'] // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('Map': Name@668) = LazyJavaClassDescriptor@645['Map'] // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('RandomAccess': Name@669) = LazyJavaClassDescriptor@127['RandomAccess'] // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('String': Name@670) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('System': Name@657) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('Unit': Name@671) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('add': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('addAll': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('clear': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('equals': Name@658) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('get': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('plus': Name@659) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('println': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('put': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    classes('test': Name@660) = null // through LazyPackageFragmentScopeForJavaPackage@663
-    deserializedPackageScope = Empty@650 // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('ArrayList': Name@654) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('HashMap': Name@656) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('add': Name@15) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('addAll': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('clear': Name@17) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('equals': Name@658) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('get': Name@18) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('plus': Name@659) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('println': Name@59) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('put': Name@52) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    functions('test': Name@660) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@663
-    memberIndex = computeMemberIndex$1@672 // through LazyPackageFragmentScopeForJavaPackage@663
+    classes('Array': Name@661) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('ArrayList': Name@663) = LazyJavaClassDescriptor@54['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('Boolean': Name@664) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('HashMap': Name@656) = LazyJavaClassDescriptor@92['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('Int': Name@665) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('List': Name@666) = LazyJavaClassDescriptor@643['List'] // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('Map': Name@667) = LazyJavaClassDescriptor@645['Map'] // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('RandomAccess': Name@668) = LazyJavaClassDescriptor@127['RandomAccess'] // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('String': Name@669) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('System': Name@657) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('Unit': Name@670) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('equals': Name@658) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    classes('test': Name@659) = null // through LazyPackageFragmentScopeForJavaPackage@662
+    deserializedPackageScope = Empty@650 // through LazyPackageFragmentScopeForJavaPackage@662
+    functions('ArrayList': Name@654) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
+    functions('HashMap': Name@656) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
+    functions('equals': Name@658) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
+    functions('test': Name@659) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@662
+    memberIndex = computeMemberIndex$1@671 // through LazyPackageFragmentScopeForJavaPackage@662
 }
 
 LazyJavaTypeParameterDescriptor@151['E'] {
-    defaultType = JetTypeImpl@673['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
-    upperBounds = LinkedHashSet@674[1] { NullableType@675 }
-    upperBoundsAsType = NullableType@675
+    defaultType = JetTypeImpl@672['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@285
+    upperBounds = LinkedHashSet@673[1] { NullableType@674 }
+    upperBoundsAsType = NullableType@674
 }
 
 LazyJavaTypeParameterDescriptor@164['E'] {
-    defaultType = JetTypeImpl@676['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@288
-    upperBounds = LinkedHashSet@677[1] { NullableType@678 }
-    upperBoundsAsType = NullableType@678
+    defaultType = JetTypeImpl@675['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@281
+    upperBounds = LinkedHashSet@676[1] { NullableType@677 }
+    upperBoundsAsType = NullableType@677
 }
 
 LazyJavaTypeParameterDescriptor@147['E'] {
-    defaultType = JetTypeImpl@679['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@310
-    upperBounds = LinkedHashSet@680[1] { NullableType@681 }
-    upperBoundsAsType = NullableType@681
+    defaultType = JetTypeImpl@678['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@295
+    upperBounds = LinkedHashSet@679[1] { NullableType@680 }
+    upperBoundsAsType = NullableType@680
 }
 
 LazyJavaTypeParameterDescriptor@178['K'] {
-    defaultType = JetTypeImpl@682['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
-    upperBounds = LinkedHashSet@683[1] { NullableType@684 }
-    upperBoundsAsType = NullableType@684
+    defaultType = JetTypeImpl@681['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
+    upperBounds = LinkedHashSet@682[1] { NullableType@683 }
+    upperBoundsAsType = NullableType@683
 }
 
 LazyJavaTypeParameterDescriptor@156['K'] {
-    defaultType = JetTypeImpl@685['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@398
-    upperBounds = LinkedHashSet@686[1] { NullableType@687 }
-    upperBoundsAsType = NullableType@687
+    defaultType = JetTypeImpl@684['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@402
+    upperBounds = LinkedHashSet@685[1] { NullableType@686 }
+    upperBoundsAsType = NullableType@686
 }
 
 LazyJavaTypeParameterDescriptor@179['V'] {
-    defaultType = JetTypeImpl@688['V']
+    defaultType = JetTypeImpl@687['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
-    upperBounds = LinkedHashSet@689[1] { NullableType@690 }
-    upperBoundsAsType = NullableType@690
+    upperBounds = LinkedHashSet@688[1] { NullableType@689 }
+    upperBoundsAsType = NullableType@689
 }
 
 LazyJavaTypeParameterDescriptor@157['V'] {
-    defaultType = JetTypeImpl@691['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@534
-    upperBounds = LinkedHashSet@692[1] { NullableType@693 }
-    upperBoundsAsType = NullableType@693
+    defaultType = JetTypeImpl@690['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@525
+    upperBounds = LinkedHashSet@691[1] { NullableType@692 }
+    upperBoundsAsType = NullableType@692
 }
 
-LazyJavaTypeParameterResolver@694 {
-    resolve(JavaTypeParameterImpl@322['E']) = LazyJavaTypeParameterDescriptor@151['E']
+LazyJavaTypeParameterResolver@693 {
+    resolve(JavaTypeParameterImpl@694['E']) = LazyJavaTypeParameterDescriptor@164['E']
 }
 
 LazyJavaTypeParameterResolver@695 {
-    resolve(JavaTypeParameterImpl@696['E']) = LazyJavaTypeParameterDescriptor@164['E']
+    resolve(JavaTypeParameterImpl@325['E']) = LazyJavaTypeParameterDescriptor@147['E']
+}
+
+LazyJavaTypeParameterResolver@696 {
+    resolve(JavaTypeParameterImpl@284['E']) = LazyJavaTypeParameterDescriptor@151['E']
 }
 
 LazyJavaTypeParameterResolver@697 {
-    resolve(JavaTypeParameterImpl@328['E']) = LazyJavaTypeParameterDescriptor@147['E']
+    resolve(JavaTypeParameterImpl@307['E']) = null
 }
 
 LazyJavaTypeParameterResolver@698 {
-    resolve(JavaTypeParameterImpl@284['E']) = null
+    resolve(JavaTypeParameterImpl@310['E']) = null
 }
 
 LazyJavaTypeParameterResolver@699 {
-    resolve(JavaTypeParameterImpl@325['E']) = null
-}
-
-LazyJavaTypeParameterResolver@700 {
-    resolve(JavaTypeParameterImpl@313['E']) = null
-}
-
-LazyJavaTypeParameterResolver@701 {
-    resolve(JavaTypeParameterImpl@340['E']) = null
-}
-
-LazyJavaTypeParameterResolver@702 {
-    resolve(JavaTypeParameterImpl@334['E']) = null
-}
-
-LazyJavaTypeParameterResolver@703 {
-    resolve(JavaTypeParameterImpl@306['E']) = null
-}
-
-LazyJavaTypeParameterResolver@704 {
-    resolve(JavaTypeParameterImpl@319['E']) = null
-}
-
-LazyJavaTypeParameterResolver@705 {
-    resolve(JavaTypeParameterImpl@337['E']) = null
-}
-
-LazyJavaTypeParameterResolver@706 {
     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 {
-    resolve(JavaTypeParameterImpl@297['E']) = null
+    resolve(JavaTypeParameterImpl@322['E']) = null
 }
 
 LazyJavaTypeParameterResolver@708 {
-    resolve(JavaTypeParameterImpl@280['E']) = null
+    resolve(JavaTypeParameterImpl@709['K']) = LazyJavaTypeParameterDescriptor@178['K']
+    resolve(JavaTypeParameterImpl@710['V']) = LazyJavaTypeParameterDescriptor@179['V']
 }
 
-LazyJavaTypeParameterResolver@709 {
-    resolve(JavaTypeParameterImpl@710['K']) = LazyJavaTypeParameterDescriptor@156['K']
-    resolve(JavaTypeParameterImpl@711['V']) = LazyJavaTypeParameterDescriptor@157['V']
+LazyJavaTypeParameterResolver@711 {
+    resolve(JavaTypeParameterImpl@712['K']) = LazyJavaTypeParameterDescriptor@156['K']
+    resolve(JavaTypeParameterImpl@713['V']) = LazyJavaTypeParameterDescriptor@157['V']
 }
 
-LazyJavaTypeParameterResolver@712 {
-    resolve(JavaTypeParameterImpl@713['K']) = LazyJavaTypeParameterDescriptor@178['K']
-    resolve(JavaTypeParameterImpl@714['V']) = LazyJavaTypeParameterDescriptor@179['V']
+LazyJavaTypeParameterResolver@714 {
+    resolve(JavaTypeParameterImpl@411['K']) = null
+    resolve(JavaTypeParameterImpl@520['V']) = null
 }
 
 LazyJavaTypeParameterResolver@715 {
-    resolve(JavaTypeParameterImpl@397['K']) = null
-    resolve(JavaTypeParameterImpl@540['V']) = null
+    resolve(JavaTypeParameterImpl@405['K']) = null
+    resolve(JavaTypeParameterImpl@534['V']) = null
 }
 
 LazyJavaTypeParameterResolver@716 {
-    resolve(JavaTypeParameterImpl@408['K']) = null
-    resolve(JavaTypeParameterImpl@546['V']) = null
+    resolve(JavaTypeParameterImpl@549['V']) = null
 }
 
 LazyJavaTypeParameterResolver@717 {
-    resolve(JavaTypeParameterImpl@533['V']) = null
+    resolve(JavaTypeParameterImpl@540['V']) = null
 }
 
-LazyJavaTypeParameterResolver@718 {
-    resolve(JavaTypeParameterImpl@520['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@730 {
+    <name not found> = ArrayList@731[1] { ResolutionCandidate@732 }
+    <name not found> = ArrayList@733[1] { ResolutionCandidate@732 }
+    <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]
+    <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]
+    <name not found> = EmptyList@13[empty]
+}
+
+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@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[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> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+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]
+    <name not found> = EmptyList@13[empty]
+    <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@910 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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 eed969233b1..45639c5dd7a 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListClone.lazy.log
@@ -1,27 +1,24 @@
 LazyJavaClassDescriptor@0['AbstractCollection'] {
     functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('clone': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@7['AbstractList'] {
-    functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('clone': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractList']
+LazyJavaClassDescriptor@6['AbstractList'] {
+    functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
 }
 
-LazyJavaClassDescriptor@11['ArrayList'] {
-    constructors = ArrayList@12[3] { JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'] } // through LazyJavaClassMemberScope@16
-    defaultType = JetTypeImpl@17['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@16
+LazyJavaClassDescriptor@10['ArrayList'] {
+    constructors = ArrayList@11[3] { JavaConstructorDescriptor@12['<init>'], JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
+    defaultType = JetTypeImpl@16['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
     functionTypeForSamInterface = null
-    functions('clone': Name@5) = ArrayList@19[1] { JavaMethodDescriptor@20['clone'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@16
-    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@16
-    nestedClasses('clone': Name@5) = null // through LazyJavaClassMemberScope@16
-    properties('clone': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
+    functions('clone': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['clone'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@15
+    nestedClassIndex = LinkedHashMap@22 // through LazyJavaClassMemberScope@15
+    nestedClasses('clone': Name@18) = null // through LazyJavaClassMemberScope@15
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@24['ArrayList']
 }
@@ -29,23 +26,21 @@ LazyJavaClassDescriptor@11['ArrayList'] {
 LazyJavaClassDescriptor@25['RandomAccess'] {
     functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    properties('clone': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     typeConstructor = LazyJavaClassTypeConstructor@28['RandomAccess']
 }
 
 LazyJavaClassDescriptor@29['Serializable'] {
     functions('clone': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@30
     memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@30
-    properties('clone': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@30
     typeConstructor = LazyJavaClassTypeConstructor@32['Serializable']
 }
 
-LazyJavaClassTypeConstructor@6['AbstractCollection'] {
+LazyJavaClassTypeConstructor@5['AbstractCollection'] {
     parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
     supertypes = ArrayList@35[1] { LazyJavaClassifierType@36['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@10['AbstractList'] {
+LazyJavaClassTypeConstructor@9['AbstractList'] {
     parameters = ArrayList@37[1] { LazyJavaTypeParameterDescriptor@38['E'] }
     supertypes = ArrayList@39[2] { LazyJavaClassifierType@40['AbstractCollection<E>'], LazyJavaClassifierType@41['List<E>'] }
 }
@@ -69,14 +64,14 @@ LazyJavaClassifierType@40['AbstractCollection<E>'] {
     arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
     classifier = JavaClassImpl@55['AbstractCollection']
     memberScope = SubstitutingScope@56
-    typeConstructor = LazyJavaClassTypeConstructor@6['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@5['AbstractCollection']
 }
 
 LazyJavaClassifierType@45['AbstractList<E>'] {
     arguments = ArrayList@57[1] { TypeProjectionImpl@58 }
     classifier = JavaClassImpl@59['AbstractList']
     memberScope = SubstitutingScope@60
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractList']
 }
 
 LazyJavaClassifierType@61['Cloneable'] {
@@ -120,28 +115,28 @@ LazyJavaClassifierType@87['E'] {
     arguments = ArrayList@88[empty]
     classifier = JavaTypeParameterImpl@89['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
-LazyJavaClassifierType@91['E'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['E']
+LazyJavaClassifierType@90['E'] {
+    arguments = ArrayList@91[empty]
+    classifier = JavaTypeParameterImpl@92['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
 }
 
 LazyJavaClassifierType@94['E'] {
     arguments = ArrayList@95[empty]
     classifier = JavaTypeParameterImpl@96['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
 }
 
-LazyJavaClassifierType@98['E'] {
-    arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+LazyJavaClassifierType@97['E'] {
+    arguments = ArrayList@98[empty]
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'false': Boolean@71
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@101['E'] {
@@ -162,49 +157,49 @@ LazyJavaClassifierType@107['E'] {
     arguments = ArrayList@108[empty]
     classifier = JavaTypeParameterImpl@96['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
 }
 
 LazyJavaClassifierType@109['E'] {
     arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@89['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
-}
-
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@100['E']
-    nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
-}
-
-LazyJavaClassifierType@113['E'] {
-    arguments = ArrayList@114[empty]
-    classifier = JavaTypeParameterImpl@103['E']
+    classifier = JavaTypeParameterImpl@85['E']
     nullable = 'true': Boolean@77
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
+LazyJavaClassifierType@111['E'] {
+    arguments = ArrayList@112[empty]
+    classifier = JavaTypeParameterImpl@106['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+}
+
+LazyJavaClassifierType@113['E'] {
+    arguments = ArrayList@114[empty]
+    classifier = JavaTypeParameterImpl@92['E']
+    nullable = 'true': Boolean@77
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
+}
+
 LazyJavaClassifierType@115['E'] {
     arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@93['E']
+    classifier = JavaTypeParameterImpl@103['E']
     nullable = 'true': Boolean@77
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
 LazyJavaClassifierType@117['E'] {
     arguments = ArrayList@118[empty]
-    classifier = JavaTypeParameterImpl@85['E']
+    classifier = JavaTypeParameterImpl@89['E']
     nullable = 'true': Boolean@77
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
 }
 
 LazyJavaClassifierType@119['E'] {
     arguments = ArrayList@120[empty]
-    classifier = JavaTypeParameterImpl@106['E']
+    classifier = JavaTypeParameterImpl@99['E']
     nullable = 'true': Boolean@77
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@86
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@41['List<E>'] {
@@ -302,8 +297,8 @@ LazyJavaPackageFragmentProvider@148 {
     packageFragments('kotlin1.Int': FqName@186) = null
     packageFragments('kotlin1.String': FqName@187) = null
     topLevelClasses(JavaClassImpl@55['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@59['AbstractList']) = LazyJavaClassDescriptor@7['AbstractList']
-    topLevelClasses(JavaClassImpl@188['ArrayList']) = LazyJavaClassDescriptor@11['ArrayList']
+    topLevelClasses(JavaClassImpl@59['AbstractList']) = LazyJavaClassDescriptor@6['AbstractList']
+    topLevelClasses(JavaClassImpl@188['ArrayList']) = LazyJavaClassDescriptor@10['ArrayList']
     topLevelClasses(JavaClassImpl@144['RandomAccess']) = LazyJavaClassDescriptor@25['RandomAccess']
     topLevelClasses(JavaClassImpl@147['Serializable']) = LazyJavaClassDescriptor@29['Serializable']
 }
@@ -319,23 +314,19 @@ LazyJavaPackageFragment@157['java'] {
 
 LazyJavaPackageFragment@161['lang'] {
     classes('ArrayList': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('clone': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@197
     deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@197
     functions('ArrayList': Name@196) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('clone': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@197
     memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@197
 }
 
 LazyJavaPackageFragment@168['util'] {
     classes('Any': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@200
     classes('Array': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('ArrayList': Name@202) = LazyJavaClassDescriptor@11['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('ArrayList': Name@202) = LazyJavaClassDescriptor@10['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@200
     classes('Int': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@200
     classes('String': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('clone': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@200
     deserializedPackageScope = Empty@192 // through LazyPackageFragmentScopeForJavaPackage@200
     functions('ArrayList': Name@196) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('clone': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@200
     memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@200
 }
 
@@ -346,21 +337,40 @@ LazyJavaTypeParameterDescriptor@43['E'] {
 }
 
 LazyJavaTypeParameterDescriptor@34['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@90
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaTypeParameterDescriptor@38['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
 }
 
 LazyJavaTypeParameterResolver@209 {
-    resolve(JavaTypeParameterImpl@210['E']) = LazyJavaTypeParameterDescriptor@38['E']
+    resolve(JavaTypeParameterImpl@210['E']) = LazyJavaTypeParameterDescriptor@34['E']
 }
 
 LazyJavaTypeParameterResolver@211 {
-    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@43['E']
+    resolve(JavaTypeParameterImpl@212['E']) = LazyJavaTypeParameterDescriptor@38['E']
 }
 
 LazyJavaTypeParameterResolver@213 {
-    resolve(JavaTypeParameterImpl@214['E']) = LazyJavaTypeParameterDescriptor@34['E']
+    resolve(JavaTypeParameterImpl@214['E']) = LazyJavaTypeParameterDescriptor@43['E']
+}
+
+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[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]
+    <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 6789f89c1c4..b575610dbb0 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/ArrayListToArray.lazy.log
@@ -2,58 +2,53 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     defaultType = JetTypeImpl@1['AbstractCollection<1>']
     functions('toArray': Name@2) = ArrayList@3[2] { JavaMethodDescriptor@4['toArray'], JavaMethodDescriptor@5['toArray'] } // through LazyJavaClassMemberScope@6
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@6
-    properties('toArray': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@8['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@12['AbstractList'] {
-    defaultType = JetTypeImpl@13['AbstractList<1>']
-    functions('toArray': Name@2) = ArrayList@14[2] { JavaMethodDescriptor@15['toArray'], JavaMethodDescriptor@16['toArray'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    properties('toArray': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@17
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+LazyJavaClassDescriptor@10['AbstractList'] {
+    defaultType = JetTypeImpl@11['AbstractList<1>']
+    functions('toArray': Name@2) = ArrayList@12[2] { JavaMethodDescriptor@13['toArray'], JavaMethodDescriptor@14['toArray'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
-LazyJavaClassDescriptor@20['ArrayList'] {
-    constructors = ArrayList@21[3] { JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'] } // through LazyJavaClassMemberScope@25
-    defaultType = JetTypeImpl@26['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@25
+LazyJavaClassDescriptor@18['ArrayList'] {
+    constructors = ArrayList@19[3] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'] } // through LazyJavaClassMemberScope@23
+    defaultType = JetTypeImpl@24['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
     functionTypeForSamInterface = null
-    functions('toArray': Name@8) = ArrayList@28[2] { JavaMethodDescriptor@29['toArray'], JavaMethodDescriptor@30['toArray'] } // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@25
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@25
-    nestedClasses('toArray': Name@8) = null // through LazyJavaClassMemberScope@25
-    properties('toArray': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['ArrayList']
+    functions('toArray': Name@26) = ArrayList@27[2] { JavaMethodDescriptor@28['toArray'], JavaMethodDescriptor@29['toArray'] } // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@23
+    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@23
+    nestedClasses('toArray': Name@26) = null // through LazyJavaClassMemberScope@23
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@33['ArrayList']
 }
 
-LazyJavaClassDescriptor@35['RandomAccess'] {
-    functions('toArray': Name@2) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
+LazyJavaClassDescriptor@34['RandomAccess'] {
+    functions('toArray': Name@2) = EmptyList@35[empty] // through LazyJavaClassMemberScope@36
     memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    properties('toArray': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
     typeConstructor = LazyJavaClassTypeConstructor@38['RandomAccess']
 }
 
 LazyJavaClassDescriptor@39['Serializable'] {
-    functions('toArray': Name@2) = EmptyList@9[empty] // through LazyJavaClassMemberScope@40
+    functions('toArray': Name@2) = EmptyList@35[empty] // through LazyJavaClassMemberScope@40
     memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    properties('toArray': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@40
     typeConstructor = LazyJavaClassTypeConstructor@42['Serializable']
 }
 
-LazyJavaClassTypeConstructor@11['AbstractCollection'] {
+LazyJavaClassTypeConstructor@9['AbstractCollection'] {
     parameters = ArrayList@43[1] { LazyJavaTypeParameterDescriptor@44['E'] }
     supertypes = ArrayList@45[1] { LazyJavaClassifierType@46['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@19['AbstractList'] {
+LazyJavaClassTypeConstructor@17['AbstractList'] {
     parameters = ArrayList@47[1] { LazyJavaTypeParameterDescriptor@48['E'] }
     supertypes = ArrayList@49[2] { LazyJavaClassifierType@50['AbstractCollection<E>'], LazyJavaClassifierType@51['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@34['ArrayList'] {
+LazyJavaClassTypeConstructor@33['ArrayList'] {
     parameters = ArrayList@52[1] { LazyJavaTypeParameterDescriptor@53['E'] }
     supertypes = ArrayList@54[5] { LazyJavaClassifierType@55['AbstractList<E>'], LazyJavaClassifierType@56['List<E>'], LazyJavaClassifierType@57['RandomAccess'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@50['AbstractCollection<E>'] {
     classifier = JavaClassImpl@65['AbstractCollection']
     memberScope = SubstitutingScope@66
     nullable = 'false': Boolean@67
-    typeConstructor = LazyJavaClassTypeConstructor@11['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@9['AbstractCollection']
 }
 
 LazyJavaClassifierType@55['AbstractList<E>'] {
     arguments = ArrayList@68[1] { TypeProjectionImpl@69 }
     classifier = JavaClassImpl@70['AbstractList']
     memberScope = SubstitutingScope@71
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
 LazyJavaClassifierType@72['Cloneable'] {
@@ -132,14 +127,14 @@ LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
-LazyJavaClassifierType@105['E'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+LazyJavaClassifierType@106['E'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@108['E']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@109['E'] {
@@ -165,14 +160,14 @@ LazyJavaClassifierType@115['E'] {
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@100['E']
+    classifier = JavaTypeParameterImpl@111['E']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@120['E'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@108['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
@@ -181,7 +176,7 @@ LazyJavaClassifierType@122['E'] {
     arguments = ArrayList@123[empty]
     classifier = JavaTypeParameterImpl@104['E']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
 LazyJavaClassifierType@124['E'] {
@@ -193,21 +188,21 @@ LazyJavaClassifierType@124['E'] {
 
 LazyJavaClassifierType@126['E'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@95['E']
+    classifier = JavaTypeParameterImpl@100['E']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@128['E'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@87
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@101
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+    classifier = JavaTypeParameterImpl@95['E']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
@@ -306,14 +301,14 @@ LazyJavaClassifierType@172['T'] {
     arguments = ArrayList@173[empty]
     classifier = JavaTypeParameterImpl@174['T']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
 }
 
 LazyJavaClassifierType@175['T'] {
     arguments = ArrayList@176[empty]
     classifier = JavaTypeParameterImpl@177['T']
     nullable = 'false': Boolean@67
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@178['T'] {
@@ -325,7 +320,7 @@ LazyJavaClassifierType@178['T'] {
 
 LazyJavaClassifierType@180['T'] {
     arguments = ArrayList@181[empty]
-    classifier = JavaTypeParameterImpl@174['T']
+    classifier = JavaTypeParameterImpl@177['T']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
@@ -339,7 +334,7 @@ LazyJavaClassifierType@182['T'] {
 
 LazyJavaClassifierType@184['T'] {
     arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@177['T']
+    classifier = JavaTypeParameterImpl@174['T']
     nullable = 'true': Boolean@87
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
 }
@@ -375,9 +370,9 @@ LazyJavaPackageFragmentProvider@186 {
     packageFragments('kotlin1.Int': FqName@219) = null
     packageFragments('kotlin1.String': FqName@220) = null
     topLevelClasses(JavaClassImpl@65['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@12['AbstractList']
-    topLevelClasses(JavaClassImpl@221['ArrayList']) = LazyJavaClassDescriptor@20['ArrayList']
-    topLevelClasses(JavaClassImpl@160['RandomAccess']) = LazyJavaClassDescriptor@35['RandomAccess']
+    topLevelClasses(JavaClassImpl@70['AbstractList']) = LazyJavaClassDescriptor@10['AbstractList']
+    topLevelClasses(JavaClassImpl@221['ArrayList']) = LazyJavaClassDescriptor@18['ArrayList']
+    topLevelClasses(JavaClassImpl@160['RandomAccess']) = LazyJavaClassDescriptor@34['RandomAccess']
     topLevelClasses(JavaClassImpl@163['Serializable']) = LazyJavaClassDescriptor@39['Serializable']
 }
 
@@ -385,32 +380,28 @@ LazyJavaPackageFragment@194['java'] {
     classes('lang': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@223
     classes('util': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@223
     deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@223
-    functions('lang': Name@226) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@223
-    functions('util': Name@227) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@223
+    functions('lang': Name@226) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@223
+    functions('util': Name@227) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@223
     memberIndex = computeMemberIndex$1@228 // through LazyPackageFragmentScopeForJavaPackage@223
 }
 
 LazyJavaPackageFragment@198['lang'] {
     classes('Array': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@230
     classes('ArrayList': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('toArray': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@230
     deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('Array': Name@229) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('ArrayList': Name@231) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('toArray': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@230
+    functions('Array': Name@229) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@230
+    functions('ArrayList': Name@231) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@230
     memberIndex = computeMemberIndex$1@232 // through LazyPackageFragmentScopeForJavaPackage@230
 }
 
 LazyJavaPackageFragment@204['util'] {
     classes('Array': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('ArrayList': Name@235) = LazyJavaClassDescriptor@20['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('ArrayList': Name@235) = LazyJavaClassDescriptor@18['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@234
     classes('Int': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@234
     classes('String': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('toArray': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@234
     deserializedPackageScope = Empty@225 // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('Array': Name@229) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('ArrayList': Name@231) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('toArray': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('Array': Name@229) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('ArrayList': Name@231) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@234
     memberIndex = computeMemberIndex$1@238 // through LazyPackageFragmentScopeForJavaPackage@234
 }
 
@@ -427,24 +418,24 @@ LazyJavaTypeParameterDescriptor@48['E'] {
 
 LazyJavaTypeParameterDescriptor@44['E'] {
     defaultType = JetTypeImpl@243['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
 }
 
 LazyJavaTypeParameterDescriptor@244['T'] {
     defaultType = JetTypeImpl@245['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
     upperBounds = LinkedHashSet@246[1] { NullableType@247 }
     upperBoundsAsType = NullableType@247
 }
 
 LazyJavaTypeParameterDescriptor@248['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@167
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
     upperBounds = LinkedHashSet@249[1] { NullableType@250 }
     upperBoundsAsType = NullableType@250
 }
 
 LazyJavaTypeParameterResolver@251 {
-    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@53['E']
+    resolve(JavaTypeParameterImpl@252['E']) = LazyJavaTypeParameterDescriptor@48['E']
 }
 
 LazyJavaTypeParameterResolver@253 {
@@ -452,13 +443,41 @@ LazyJavaTypeParameterResolver@253 {
 }
 
 LazyJavaTypeParameterResolver@255 {
-    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@48['E']
+    resolve(JavaTypeParameterImpl@256['E']) = LazyJavaTypeParameterDescriptor@53['E']
 }
 
 LazyJavaTypeParameterResolver@257 {
-    resolve(JavaTypeParameterImpl@258['T']) = LazyJavaTypeParameterDescriptor@248['T']
+    resolve(JavaTypeParameterImpl@258['T']) = LazyJavaTypeParameterDescriptor@244['T']
 }
 
 LazyJavaTypeParameterResolver@259 {
-    resolve(JavaTypeParameterImpl@260['T']) = LazyJavaTypeParameterDescriptor@244['T']
+    resolve(JavaTypeParameterImpl@260['T']) = LazyJavaTypeParameterDescriptor@248['T']
+}
+
+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@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[3] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278 }
+    <name not found> = ArrayList@279[3] { ResolutionCandidate@276, ResolutionCandidate@277, ResolutionCandidate@278 }
+    <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/jdk-annotations/sql/DriverManager.lazy.log b/compiler/testData/diagnostics/tests/jdk-annotations/sql/DriverManager.lazy.log
index 532c3ce6472..5246b90b7b9 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@62['Connection']
+    classifier = JavaClassImpl@68['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
 
 LazyJavaClassifierType@71['Connection'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@65['Connection']
+    classifier = JavaClassImpl@59['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
 
 LazyJavaClassifierType@73['Connection'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@59['Connection']
+    classifier = JavaClassImpl@62['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
 
 LazyJavaClassifierType@75['Connection'] {
     arguments = ArrayList@76[empty]
-    classifier = JavaClassImpl@68['Connection']
+    classifier = JavaClassImpl@65['Connection']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@5['Connection']
 }
@@ -205,14 +205,14 @@ LazyJavaClassifierType@91['Driver'] {
 
 LazyJavaClassifierType@93['Driver'] {
     arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@79['Driver']
+    classifier = JavaClassImpl@82['Driver']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@7['Driver']
 }
 
 LazyJavaClassifierType@95['Driver'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaClassImpl@82['Driver']
+    classifier = JavaClassImpl@79['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@117['Properties']
+    classifier = JavaClassImpl@120['Properties']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
 }
 
 LazyJavaClassifierType@123['Properties'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@120['Properties']
+    classifier = JavaClassImpl@117['Properties']
     nullable = 'true': Boolean@56
     typeConstructor = LazyJavaClassTypeConstructor@34['Properties']
 }
@@ -335,42 +335,42 @@ LazyJavaClassifierType@144['String'] {
 
 LazyJavaClassifierType@147['String'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaClassImpl@137['String']
+    classifier = JavaClassImpl@134['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
 
 LazyJavaClassifierType@149['String'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaClassImpl@131['String']
+    classifier = JavaClassImpl@143['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
 
 LazyJavaClassifierType@151['String'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@143['String']
+    classifier = JavaClassImpl@127['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
 
 LazyJavaClassifierType@153['String'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaClassImpl@146['String']
+    classifier = JavaClassImpl@131['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
 
 LazyJavaClassifierType@155['String'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaClassImpl@134['String']
+    classifier = JavaClassImpl@146['String']
     nullable = 'true': Boolean@56
     typeConstructor = DeserializedClassTypeConstructor@128
 }
 
 LazyJavaClassifierType@157['String'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@127['String']
+    classifier = JavaClassImpl@137['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@59['Connection']) = LazyJavaClassDescriptor@4['Connection']
+    topLevelClasses(JavaClassImpl@62['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']
@@ -463,3 +463,464 @@ LazyJavaTypeParameterDescriptor@45['E'] {
 LazyJavaTypeParameterResolver@220 {
     resolve(JavaTypeParameterImpl@221['E']) = LazyJavaTypeParameterDescriptor@45['E']
 }
+
+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]
+    <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 }
+    <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@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@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> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+}
+
+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@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@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@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[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@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[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@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@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+}
+
+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]
+}
+
+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]
+}
+
+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, ... }
+    <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, ... }
+    <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, ... }
+    <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, ... }
+    <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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@431 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@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 {
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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 c6da5fdcd92..c63740e3af9 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/sql/ResultSet.lazy.log
@@ -1,18 +1,16 @@
 LazyJavaClassDescriptor@0['AutoCloseable'] {
     functions('getMetaData': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('getMetaData': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@7['ResultSet'] {
-    defaultType = JetTypeImpl@8['ResultSet']
-    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
-    functions('getMetaData': Name@5) = ArrayList@11[1] { JavaMethodDescriptor@12['getMetaData'] } // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@10
-    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@10
-    nestedClasses('getMetaData': Name@5) = null // through LazyJavaClassMemberScope@10
-    properties('getMetaData': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@10
+LazyJavaClassDescriptor@6['ResultSet'] {
+    defaultType = JetTypeImpl@7['ResultSet']
+    enumEntryIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@9
+    functions('getMetaData': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['getMetaData'] } // through LazyJavaClassMemberScope@9
+    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@9
+    nestedClassIndex = LinkedHashMap@14 // through LazyJavaClassMemberScope@9
+    nestedClasses('getMetaData': Name@10) = null // through LazyJavaClassMemberScope@9
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@16['ResultSet']
 }
@@ -21,7 +19,7 @@ LazyJavaClassDescriptor@17['ResultSetMetaData'] {
     typeConstructor = LazyJavaClassTypeConstructor@18['ResultSetMetaData']
 }
 
-LazyJavaClassTypeConstructor@6['AutoCloseable'] {
+LazyJavaClassTypeConstructor@5['AutoCloseable'] {
     parameters = ArrayList@19[empty]
     supertypes = ArrayList@20[1] { JetTypeImpl@21['Any'] }
 }
@@ -40,7 +38,7 @@ LazyJavaClassifierType@24['AutoCloseable'] {
     arguments = ArrayList@27[empty]
     classifier = JavaClassImpl@28['AutoCloseable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['AutoCloseable']
 }
 
 LazyJavaClassifierType@29['Object'] {
@@ -83,35 +81,37 @@ LazyJavaPackageFragmentProvider@43 {
     packageFragments('kotlin.io': FqName@55) = null
     packageFragments('kotlin.jvm': FqName@56) = null
     topLevelClasses(JavaClassImpl@28['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@57['ResultSet']) = LazyJavaClassDescriptor@7['ResultSet']
+    topLevelClasses(JavaClassImpl@57['ResultSet']) = LazyJavaClassDescriptor@6['ResultSet']
     topLevelClasses(JavaClassImpl@58['ResultSetMetaData']) = LazyJavaClassDescriptor@17['ResultSetMetaData']
 }
 
 LazyJavaPackageFragment@45['<root>'] {
-    classes('getMetaData': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('java': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('getMetaData': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('java': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
 LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('sql': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('lang': Name@66) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('sql': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('lang': Name@65) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@49['lang'] {
-    classes('getMetaData': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('java': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('getMetaData': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('java': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@51['sql'] {
-    classes('ResultSet': Name@70) = LazyJavaClassDescriptor@7['ResultSet'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ResultSetMetaData': Name@72) = LazyJavaClassDescriptor@17['ResultSetMetaData'] // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('ResultSet': Name@68) = LazyJavaClassDescriptor@6['ResultSet'] // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('ResultSetMetaData': Name@70) = LazyJavaClassDescriptor@17['ResultSetMetaData'] // through LazyPackageFragmentScopeForJavaPackage@69
+}
+
+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 }
 }
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 447759cb147..6e620aa9f5c 100644
--- a/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
+++ b/compiler/testData/diagnostics/tests/jdk-annotations/sql/Statement.lazy.log
@@ -2,53 +2,48 @@ LazyJavaClassDescriptor@0['AutoCloseable'] {
     functions('executeQuery': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     functions('executeUpdate': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
-    properties('executeQuery': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    properties('executeUpdate': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@9['PreparedStatement'] {
-    defaultType = JetTypeImpl@10['PreparedStatement']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
-    functions('executeQuery': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['executeQuery'], JavaMethodDescriptor@16['executeQuery'] } // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@12
-    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@12
-    nestedClasses('executeQuery': Name@13) = null // through LazyJavaClassMemberScope@12
-    properties('executeQuery': Name@13) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['PreparedStatement']
+LazyJavaClassDescriptor@7['PreparedStatement'] {
+    defaultType = JetTypeImpl@8['PreparedStatement']
+    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
+    functions('executeQuery': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['executeQuery'], JavaMethodDescriptor@14['executeQuery'] } // through LazyJavaClassMemberScope@10
+    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@10
+    nestedClassIndex = LinkedHashMap@16 // through LazyJavaClassMemberScope@10
+    nestedClasses('executeQuery': Name@11) = null // through LazyJavaClassMemberScope@10
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@18['PreparedStatement']
 }
 
-LazyJavaClassDescriptor@21['ResultSet'] {
-    typeConstructor = LazyJavaClassTypeConstructor@22['ResultSet']
+LazyJavaClassDescriptor@19['ResultSet'] {
+    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
 }
 
-LazyJavaClassDescriptor@23['Statement'] {
-    defaultType = JetTypeImpl@24['Statement']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@26
-    functions('executeQuery': Name@6) = ArrayList@27[1] { JavaMethodDescriptor@28['executeQuery'] } // through LazyJavaClassMemberScope@26
-    functions('executeUpdate': Name@7) = ArrayList@29[4] { JavaMethodDescriptor@30['executeUpdate'], JavaMethodDescriptor@31['executeUpdate'], JavaMethodDescriptor@32['executeUpdate'], ... } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@26
-    nestedClasses('executeQuery': Name@6) = null // through LazyJavaClassMemberScope@26
-    nestedClasses('executeUpdate': Name@7) = null // through LazyJavaClassMemberScope@26
-    properties('executeQuery': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    properties('executeUpdate': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+LazyJavaClassDescriptor@21['Statement'] {
+    defaultType = JetTypeImpl@22['Statement']
+    enumEntryIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@24
+    functions('executeQuery': Name@25) = ArrayList@26[1] { JavaMethodDescriptor@27['executeQuery'] } // through LazyJavaClassMemberScope@24
+    functions('executeUpdate': Name@28) = ArrayList@29[4] { JavaMethodDescriptor@30['executeUpdate'], JavaMethodDescriptor@31['executeUpdate'], JavaMethodDescriptor@32['executeUpdate'], ... } // through LazyJavaClassMemberScope@24
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@24
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@24
+    nestedClasses('executeQuery': Name@25) = null // through LazyJavaClassMemberScope@24
+    nestedClasses('executeUpdate': Name@28) = null // through LazyJavaClassMemberScope@24
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@36['Statement']
 }
 
-LazyJavaClassTypeConstructor@8['AutoCloseable'] {
+LazyJavaClassTypeConstructor@6['AutoCloseable'] {
     parameters = ArrayList@37[empty]
     supertypes = ArrayList@38[1] { JetTypeImpl@39['Any'] }
 }
 
-LazyJavaClassTypeConstructor@20['PreparedStatement'] {
+LazyJavaClassTypeConstructor@18['PreparedStatement'] {
     parameters = ArrayList@40[empty]
     supertypes = ArrayList@41[1] { LazyJavaClassifierType@42['Statement'] }
 }
 
-LazyJavaClassTypeConstructor@22['ResultSet'] {
+LazyJavaClassTypeConstructor@20['ResultSet'] {
     parameters = ArrayList@43[empty]
     supertypes = ArrayList@44[1] { LazyJavaClassifierType@45['AutoCloseable'] }
 }
@@ -62,12 +57,12 @@ LazyJavaClassifierType@48['AutoCloseable'] {
     arguments = ArrayList@49[empty]
     classifier = JavaClassImpl@50['AutoCloseable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
 }
 
 LazyJavaClassifierType@45['AutoCloseable'] {
     classifier = JavaClassImpl@51['AutoCloseable']
-    typeConstructor = LazyJavaClassTypeConstructor@8['AutoCloseable']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AutoCloseable']
 }
 
 LazyJavaClassifierType@52['Object'] {
@@ -79,34 +74,34 @@ LazyJavaClassifierType@55['ResultSet'] {
     arguments = ArrayList@56[empty]
     classifier = JavaClassImpl@57['ResultSet']
     nullable = 'false': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@22['ResultSet']
+    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
 }
 
 LazyJavaClassifierType@59['ResultSet'] {
     arguments = ArrayList@60[empty]
     classifier = JavaClassImpl@61['ResultSet']
     nullable = 'false': Boolean@58
-    typeConstructor = LazyJavaClassTypeConstructor@22['ResultSet']
+    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
 }
 
 LazyJavaClassifierType@62['ResultSet'] {
     arguments = ArrayList@63[empty]
     classifier = JavaClassImpl@57['ResultSet']
     nullable = 'true': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@22['ResultSet']
+    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
 }
 
 LazyJavaClassifierType@65['ResultSet'] {
     arguments = ArrayList@66[empty]
     classifier = JavaClassImpl@61['ResultSet']
     nullable = 'true': Boolean@64
-    typeConstructor = LazyJavaClassTypeConstructor@22['ResultSet']
+    typeConstructor = LazyJavaClassTypeConstructor@20['ResultSet']
 }
 
 LazyJavaClassifierType@42['Statement'] {
     arguments = ArrayList@67[empty]
     classifier = JavaClassImpl@68['Statement']
-    memberScope = LazyJavaClassMemberScope@26
+    memberScope = LazyJavaClassMemberScope@24
     typeConstructor = LazyJavaClassTypeConstructor@36['Statement']
 }
 
@@ -161,7 +156,7 @@ LazyJavaClassifierType@88['String'] {
 
 LazyJavaClassifierType@90['String'] {
     arguments = ArrayList@91[empty]
-    classifier = JavaClassImpl@84['String']
+    classifier = JavaClassImpl@78['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
@@ -175,7 +170,7 @@ LazyJavaClassifierType@92['String'] {
 
 LazyJavaClassifierType@94['String'] {
     arguments = ArrayList@95[empty]
-    classifier = JavaClassImpl@78['String']
+    classifier = JavaClassImpl@71['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
@@ -189,7 +184,7 @@ LazyJavaClassifierType@96['String'] {
 
 LazyJavaClassifierType@98['String'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaClassImpl@71['String']
+    classifier = JavaClassImpl@84['String']
     nullable = 'true': Boolean@64
     typeConstructor = DeserializedClassTypeConstructor@72
 }
@@ -219,42 +214,110 @@ LazyJavaPackageFragmentProvider@104 {
     packageFragments('kotlin.io': FqName@120) = null
     packageFragments('kotlin.jvm': FqName@121) = null
     topLevelClasses(JavaClassImpl@50['AutoCloseable']) = LazyJavaClassDescriptor@0['AutoCloseable']
-    topLevelClasses(JavaClassImpl@122['PreparedStatement']) = LazyJavaClassDescriptor@9['PreparedStatement']
-    topLevelClasses(JavaClassImpl@57['ResultSet']) = LazyJavaClassDescriptor@21['ResultSet']
-    topLevelClasses(JavaClassImpl@123['Statement']) = LazyJavaClassDescriptor@23['Statement']
+    topLevelClasses(JavaClassImpl@122['PreparedStatement']) = LazyJavaClassDescriptor@7['PreparedStatement']
+    topLevelClasses(JavaClassImpl@57['ResultSet']) = LazyJavaClassDescriptor@19['ResultSet']
+    topLevelClasses(JavaClassImpl@123['Statement']) = LazyJavaClassDescriptor@21['Statement']
 }
 
 LazyJavaPackageFragment@106['<root>'] {
     classes('String': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('executeQuery': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('executeUpdate': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@125
     classes('java': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('executeQuery': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('executeUpdate': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
 LazyJavaPackageFragment@109['java'] {
-    classes('lang': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('sql': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('lang': Name@132) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('lang': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('sql': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    deserializedPackageScope = Empty@130 // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('lang': Name@131) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@128
 }
 
 LazyJavaPackageFragment@111['lang'] {
-    classes('executeQuery': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('executeUpdate': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('java': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@127 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('executeQuery': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('executeUpdate': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('java': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@133
 }
 
 LazyJavaPackageFragment@114['sql'] {
-    classes('PreparedStatement': Name@136) = LazyJavaClassDescriptor@9['PreparedStatement'] // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('ResultSet': Name@138) = LazyJavaClassDescriptor@21['ResultSet'] // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Statement': Name@139) = LazyJavaClassDescriptor@23['Statement'] // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('PreparedStatement': Name@134) = LazyJavaClassDescriptor@7['PreparedStatement'] // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('ResultSet': Name@136) = LazyJavaClassDescriptor@19['ResultSet'] // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Statement': Name@137) = LazyJavaClassDescriptor@21['Statement'] // through LazyPackageFragmentScopeForJavaPackage@135
+}
+
+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 }
+}
+
+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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/kt310.lazy.log b/compiler/testData/diagnostics/tests/kt310.lazy.log
index 5fdc4481a5f..327e6a95797 100644
--- a/compiler/testData/diagnostics/tests/kt310.lazy.log
+++ b/compiler/testData/diagnostics/tests/kt310.lazy.log
@@ -39,3 +39,59 @@ LazyJavaPackageFragment@8['lang'] {
     functions('length': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
+
+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]
+    <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 e64232a8645..bea9966b30a 100644
--- a/compiler/testData/diagnostics/tests/kt53.lazy.log
+++ b/compiler/testData/diagnostics/tests/kt53.lazy.log
@@ -32,3 +32,10 @@ LazyJavaPackageFragment@8['java'] {
 LazyJavaPackageFragment@10['lang'] {
     deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log b/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
index 4da7d95412b..57c0d35d579 100644
--- a/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt1703.lazy.log
@@ -33,55 +33,128 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Unit': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('forEach': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('hasNext': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('iterator': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('next': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('operation': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('use': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('Array': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@32) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('forEach': Name@33) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('hasNext': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@35) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('iterator': Name@36) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('next': Name@37) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('operation': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('use': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('operation': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('use': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('Array': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('equals': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('forEach': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('operation': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('use': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('Array': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('forEach': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('hasNext': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('iterator': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('next': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('operation': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('plus': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('use': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('Array': Name@42) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('equals': Name@32) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('forEach': Name@33) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('hasNext': Name@34) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('invoke': Name@35) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('iterator': Name@36) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('next': Name@37) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('operation': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('plus': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('use': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('Array': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('equals': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('forEach': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('operation': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('use': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('Array': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('equals': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('forEach': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('operation': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('use': Name@35) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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 }
+    <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]
+    <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]
+    <name not found> = EmptyList@38[empty]
+}
+
+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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt361.lazy.log b/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
index 57c39c40e0b..aef7fd27615 100644
--- a/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt361.lazy.log
@@ -24,3 +24,8 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 536d243912e..3844972a144 100644
--- a/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt3920.lazy.log
@@ -15,34 +15,57 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('f': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log b/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
index d403af4fd4b..684e6841c3c 100644
--- a/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt3988.lazy.log
@@ -56,3 +56,43 @@ LazyJavaPackageFragment@15['lang'] {
     functions('new2': Name@34) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
 }
+
+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]
+    <name not found> = EmptyList@36[empty]
+    <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]
+    <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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
+}
diff --git a/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log b/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
index 84a9169fb37..994d37303aa 100644
--- a/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt4247.lazy.log
@@ -17,25 +17,55 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('bar1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('bar1': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('bar1': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('bar1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar1': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('bar1': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('bar1': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <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@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@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
 }
diff --git a/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log b/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
index 15dae49f01d..c4abde1c3a3 100644
--- a/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt4586.lazy.log
@@ -10,87 +10,79 @@ LazyJavaClassDescriptor@2['AbstractStringBuilder'] {
     functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
     functions('toString': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['toString'] } // through LazyJavaClassMemberScope@9
     memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@9
-    properties('append': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
     properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
     properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
-    properties('toString': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@21['Appendable'] {
-    defaultType = JetTypeImpl@22['Appendable']
-    functions('append': Name@23) = ArrayList@24[3] { JavaMethodDescriptor@25['append'], JavaMethodDescriptor@26['append'], JavaMethodDescriptor@27['append'] } // through LazyJavaClassMemberScope@28
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@28
-    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@28
-    functions('toString': Name@29) = ArrayList@30[1] { DeserializedSimpleFunctionDescriptor@31['toString'] } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@32 // through LazyJavaClassMemberScope@28
-    properties('append': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@28
-    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@28
-    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@28
-    properties('toString': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@28
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+LazyJavaClassDescriptor@19['Appendable'] {
+    defaultType = JetTypeImpl@20['Appendable']
+    functions('append': Name@21) = ArrayList@22[3] { JavaMethodDescriptor@23['append'], JavaMethodDescriptor@24['append'], JavaMethodDescriptor@25['append'] } // through LazyJavaClassMemberScope@26
+    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
+    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
+    functions('toString': Name@27) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['toString'] } // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@26
+    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
+    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@26
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
-LazyJavaClassDescriptor@35['Serializable'] {
-    defaultType = JetTypeImpl@36['Serializable']
-    functions('append': Name@4) = EmptyList@11[empty] // through LazyJavaClassMemberScope@37
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@37
-    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@37
-    functions('toString': Name@13) = ArrayList@38[1] { DeserializedSimpleFunctionDescriptor@39['toString'] } // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@37
-    properties('append': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@37
-    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@37
-    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@37
-    properties('toString': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@41['Serializable']
+LazyJavaClassDescriptor@33['Serializable'] {
+    defaultType = JetTypeImpl@34['Serializable']
+    functions('append': Name@4) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
+    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
+    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
+    functions('toString': Name@13) = ArrayList@36[1] { DeserializedSimpleFunctionDescriptor@37['toString'] } // through LazyJavaClassMemberScope@35
+    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@35
+    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
+    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
 }
 
-LazyJavaClassDescriptor@42['StringBuffer'] {
+LazyJavaClassDescriptor@40['StringBuffer'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@43['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
 
-LazyJavaClassDescriptor@44['StringBuilder'] {
-    constructors = ArrayList@45[4] { JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], JavaConstructorDescriptor@48['<init>'], ... } // through LazyJavaClassMemberScope@49
-    defaultType = JetTypeImpl@50['StringBuilder']
-    enumEntryIndex = LinkedHashMap@51 // through LazyJavaClassMemberScope@49
+LazyJavaClassDescriptor@42['StringBuilder'] {
+    constructors = ArrayList@43[4] { JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], ... } // through LazyJavaClassMemberScope@47
+    defaultType = JetTypeImpl@48['StringBuilder']
+    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@47
     functionTypeForSamInterface = null
-    functions('append': Name@17) = ArrayList@52[14] { JavaMethodDescriptor@53['append'], JavaMethodDescriptor@54['append'], JavaMethodDescriptor@55['append'], ... } // through LazyJavaClassMemberScope@49
-    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@49
-    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@49
-    functions('toString': Name@18) = ArrayList@56[1] { JavaMethodDescriptor@57['toString'] } // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@49
-    nestedClassIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@49
-    nestedClasses('append': Name@17) = null // through LazyJavaClassMemberScope@49
-    nestedClasses('init': Name@10) = null // through LazyJavaClassMemberScope@49
-    nestedClasses('string': Name@12) = null // through LazyJavaClassMemberScope@49
-    nestedClasses('toString': Name@18) = null // through LazyJavaClassMemberScope@49
-    properties('append': Name@17) = EmptyList@11[empty] // through LazyJavaClassMemberScope@49
-    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@49
-    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@49
-    properties('toString': Name@18) = EmptyList@11[empty] // through LazyJavaClassMemberScope@49
+    functions('append': Name@50) = ArrayList@51[14] { JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], JavaMethodDescriptor@54['append'], ... } // through LazyJavaClassMemberScope@47
+    functions('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
+    functions('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
+    functions('toString': Name@55) = ArrayList@56[1] { JavaMethodDescriptor@57['toString'] } // through LazyJavaClassMemberScope@47
+    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@47
+    nestedClassIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@47
+    nestedClasses('append': Name@50) = null // through LazyJavaClassMemberScope@47
+    nestedClasses('init': Name@10) = null // through LazyJavaClassMemberScope@47
+    nestedClasses('string': Name@12) = null // through LazyJavaClassMemberScope@47
+    nestedClasses('toString': Name@55) = null // through LazyJavaClassMemberScope@47
+    properties('init': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
+    properties('string': Name@12) = EmptyList@11[empty] // through LazyJavaClassMemberScope@47
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@60['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
-LazyJavaClassTypeConstructor@20['AbstractStringBuilder'] {
+LazyJavaClassTypeConstructor@18['AbstractStringBuilder'] {
     parameters = ArrayList@62[empty]
     supertypes = ArrayList@63[2] { LazyJavaClassifierType@64['Appendable'], LazyJavaClassifierType@65['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@34['Appendable'] {
+LazyJavaClassTypeConstructor@32['Appendable'] {
     parameters = ArrayList@66[empty]
     supertypes = ArrayList@67[1] { JetTypeImpl@68['Any'] }
 }
 
-LazyJavaClassTypeConstructor@41['Serializable'] {
+LazyJavaClassTypeConstructor@39['Serializable'] {
     parameters = ArrayList@69[empty]
     supertypes = ArrayList@70[1] { JetTypeImpl@68['Any'] }
 }
 
-LazyJavaClassTypeConstructor@43['StringBuffer'] {
+LazyJavaClassTypeConstructor@41['StringBuffer'] {
     parameters = ArrayList@71[empty]
     supertypes = ArrayList@72[3] { LazyJavaClassifierType@73['AbstractStringBuilder'], LazyJavaClassifierType@74['Serializable'], LazyJavaClassifierType@75['CharSequence'] }
 }
@@ -104,254 +96,254 @@ LazyJavaClassifierType@78['AbstractStringBuilder'] {
     arguments = ArrayList@81[empty]
     classifier = JavaClassImpl@82['AbstractStringBuilder']
     memberScope = LazyJavaClassMemberScope@9
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@83['AbstractStringBuilder'] {
     arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@87['AbstractStringBuilder'] {
     arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@90['AbstractStringBuilder'] {
     arguments = ArrayList@91[empty]
     classifier = JavaClassImpl@92['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@93['AbstractStringBuilder'] {
     arguments = ArrayList@94[empty]
     classifier = JavaClassImpl@95['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@96['AbstractStringBuilder'] {
     arguments = ArrayList@97[empty]
     classifier = JavaClassImpl@98['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@99['AbstractStringBuilder'] {
     arguments = ArrayList@100[empty]
     classifier = JavaClassImpl@101['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@102['AbstractStringBuilder'] {
     arguments = ArrayList@103[empty]
     classifier = JavaClassImpl@104['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@105['AbstractStringBuilder'] {
     arguments = ArrayList@106[empty]
     classifier = JavaClassImpl@107['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@108['AbstractStringBuilder'] {
     arguments = ArrayList@109[empty]
     classifier = JavaClassImpl@110['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@111['AbstractStringBuilder'] {
     arguments = ArrayList@112[empty]
     classifier = JavaClassImpl@113['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@114['AbstractStringBuilder'] {
     arguments = ArrayList@115[empty]
     classifier = JavaClassImpl@116['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@117['AbstractStringBuilder'] {
     arguments = ArrayList@118[empty]
     classifier = JavaClassImpl@119['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@120['AbstractStringBuilder'] {
     arguments = ArrayList@121[empty]
     classifier = JavaClassImpl@122['AbstractStringBuilder']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@123['AbstractStringBuilder'] {
     arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@95['AbstractStringBuilder']
+    classifier = JavaClassImpl@119['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@126['AbstractStringBuilder'] {
     arguments = ArrayList@127[empty]
     classifier = JavaClassImpl@89['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@128['AbstractStringBuilder'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@116['AbstractStringBuilder']
+    classifier = JavaClassImpl@95['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@130['AbstractStringBuilder'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaClassImpl@104['AbstractStringBuilder']
+    classifier = JavaClassImpl@101['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@132['AbstractStringBuilder'] {
     arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@98['AbstractStringBuilder']
+    classifier = JavaClassImpl@107['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@134['AbstractStringBuilder'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@122['AbstractStringBuilder']
+    classifier = JavaClassImpl@92['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@136['AbstractStringBuilder'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@92['AbstractStringBuilder']
+    classifier = JavaClassImpl@110['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@138['AbstractStringBuilder'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@119['AbstractStringBuilder']
+    classifier = JavaClassImpl@122['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@140['AbstractStringBuilder'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@101['AbstractStringBuilder']
+    classifier = JavaClassImpl@85['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@142['AbstractStringBuilder'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@85['AbstractStringBuilder']
+    classifier = JavaClassImpl@116['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@144['AbstractStringBuilder'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@113['AbstractStringBuilder']
+    classifier = JavaClassImpl@104['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@146['AbstractStringBuilder'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@107['AbstractStringBuilder']
+    classifier = JavaClassImpl@98['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@148['AbstractStringBuilder'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@110['AbstractStringBuilder']
+    classifier = JavaClassImpl@113['AbstractStringBuilder']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@73['AbstractStringBuilder'] {
     arguments = ArrayList@150[empty]
     classifier = JavaClassImpl@151['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@64['Appendable'] {
     arguments = ArrayList@152[empty]
     classifier = JavaClassImpl@153['Appendable']
-    memberScope = LazyJavaClassMemberScope@28
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+    memberScope = LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@154['Appendable'] {
     arguments = ArrayList@155[empty]
     classifier = JavaClassImpl@156['Appendable']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@157['Appendable'] {
     arguments = ArrayList@158[empty]
     classifier = JavaClassImpl@159['Appendable']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@160['Appendable'] {
     arguments = ArrayList@161[empty]
     classifier = JavaClassImpl@162['Appendable']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@163['Appendable'] {
     arguments = ArrayList@164[empty]
-    classifier = JavaClassImpl@162['Appendable']
+    classifier = JavaClassImpl@159['Appendable']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@165['Appendable'] {
     arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@159['Appendable']
+    classifier = JavaClassImpl@162['Appendable']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
 LazyJavaClassifierType@167['Appendable'] {
     arguments = ArrayList@168[empty]
     classifier = JavaClassImpl@156['Appendable']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@34['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@32['Appendable']
 }
 
-LazyJavaClassifierType@80['CharSequence'] {
+LazyJavaClassifierType@65['CharSequence'] {
     arguments = ArrayList@169[empty]
     classifier = JavaClassImpl@170['CharSequence']
     memberScope = DeserializedClassMemberScope@171
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
-LazyJavaClassifierType@65['CharSequence'] {
+LazyJavaClassifierType@80['CharSequence'] {
     arguments = ArrayList@173[empty]
     classifier = JavaClassImpl@174['CharSequence']
     memberScope = DeserializedClassMemberScope@171
@@ -416,35 +408,35 @@ LazyJavaClassifierType@196['CharSequence'] {
 
 LazyJavaClassifierType@198['CharSequence'] {
     arguments = ArrayList@199[empty]
-    classifier = JavaClassImpl@177['CharSequence']
+    classifier = JavaClassImpl@195['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@200['CharSequence'] {
     arguments = ArrayList@201[empty]
-    classifier = JavaClassImpl@195['CharSequence']
+    classifier = JavaClassImpl@186['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@202['CharSequence'] {
     arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@186['CharSequence']
+    classifier = JavaClassImpl@189['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@204['CharSequence'] {
     arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@183['CharSequence']
+    classifier = JavaClassImpl@177['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
 
 LazyJavaClassifierType@206['CharSequence'] {
     arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@189['CharSequence']
+    classifier = JavaClassImpl@183['CharSequence']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@172
 }
@@ -507,13 +499,13 @@ LazyJavaClassifierType@226['Object'] {
 LazyJavaClassifierType@79['Serializable'] {
     arguments = ArrayList@228[empty]
     classifier = JavaClassImpl@229['Serializable']
-    memberScope = LazyJavaClassMemberScope@37
-    typeConstructor = LazyJavaClassTypeConstructor@41['Serializable']
+    memberScope = LazyJavaClassMemberScope@35
+    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
 }
 
 LazyJavaClassifierType@74['Serializable'] {
     classifier = JavaClassImpl@230['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@41['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@39['Serializable']
 }
 
 LazyJavaClassifierType@231['String'] {
@@ -560,14 +552,14 @@ LazyJavaClassifierType@247['String'] {
 
 LazyJavaClassifierType@249['String'] {
     arguments = ArrayList@250[empty]
-    classifier = JavaClassImpl@246['String']
+    classifier = JavaClassImpl@240['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
 
 LazyJavaClassifierType@251['String'] {
     arguments = ArrayList@252[empty]
-    classifier = JavaClassImpl@240['String']
+    classifier = JavaClassImpl@237['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
@@ -581,7 +573,7 @@ LazyJavaClassifierType@253['String'] {
 
 LazyJavaClassifierType@255['String'] {
     arguments = ArrayList@256[empty]
-    classifier = JavaClassImpl@237['String']
+    classifier = JavaClassImpl@246['String']
     nullable = 'true': Boolean@125
     typeConstructor = DeserializedClassTypeConstructor@234
 }
@@ -590,28 +582,28 @@ LazyJavaClassifierType@257['StringBuffer'] {
     arguments = ArrayList@258[empty]
     classifier = JavaClassImpl@259['StringBuffer']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@43['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
 
 LazyJavaClassifierType@260['StringBuffer'] {
     arguments = ArrayList@261[empty]
     classifier = JavaClassImpl@262['StringBuffer']
     nullable = 'false': Boolean@86
-    typeConstructor = LazyJavaClassTypeConstructor@43['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
 
 LazyJavaClassifierType@263['StringBuffer'] {
     arguments = ArrayList@264[empty]
     classifier = JavaClassImpl@259['StringBuffer']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@43['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
 
 LazyJavaClassifierType@265['StringBuffer'] {
     arguments = ArrayList@266[empty]
     classifier = JavaClassImpl@262['StringBuffer']
     nullable = 'true': Boolean@125
-    typeConstructor = LazyJavaClassTypeConstructor@43['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@41['StringBuffer']
 }
 
 LazyJavaClassifierType@267['StringBuilder'] {
@@ -721,56 +713,56 @@ LazyJavaClassifierType@309['StringBuilder'] {
 
 LazyJavaClassifierType@312['StringBuilder'] {
     arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@278['StringBuilder']
+    classifier = JavaClassImpl@308['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@314['StringBuilder'] {
     arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@269['StringBuilder']
+    classifier = JavaClassImpl@272['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@316['StringBuilder'] {
     arguments = ArrayList@317[empty]
-    classifier = JavaClassImpl@290['StringBuilder']
+    classifier = JavaClassImpl@281['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@318['StringBuilder'] {
     arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@299['StringBuilder']
+    classifier = JavaClassImpl@311['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@320['StringBuilder'] {
     arguments = ArrayList@321[empty]
-    classifier = JavaClassImpl@293['StringBuilder']
+    classifier = JavaClassImpl@299['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@322['StringBuilder'] {
     arguments = ArrayList@323[empty]
-    classifier = JavaClassImpl@275['StringBuilder']
+    classifier = JavaClassImpl@284['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@324['StringBuilder'] {
     arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@308['StringBuilder']
+    classifier = JavaClassImpl@275['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@326['StringBuilder'] {
     arguments = ArrayList@327[empty]
-    classifier = JavaClassImpl@296['StringBuilder']
+    classifier = JavaClassImpl@269['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
@@ -791,14 +783,14 @@ LazyJavaClassifierType@330['StringBuilder'] {
 
 LazyJavaClassifierType@332['StringBuilder'] {
     arguments = ArrayList@333[empty]
-    classifier = JavaClassImpl@311['StringBuilder']
+    classifier = JavaClassImpl@293['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@334['StringBuilder'] {
     arguments = ArrayList@335[empty]
-    classifier = JavaClassImpl@284['StringBuilder']
+    classifier = JavaClassImpl@278['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
@@ -812,14 +804,14 @@ LazyJavaClassifierType@336['StringBuilder'] {
 
 LazyJavaClassifierType@338['StringBuilder'] {
     arguments = ArrayList@339[empty]
-    classifier = JavaClassImpl@281['StringBuilder']
+    classifier = JavaClassImpl@290['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
 
 LazyJavaClassifierType@340['StringBuilder'] {
     arguments = ArrayList@341[empty]
-    classifier = JavaClassImpl@272['StringBuilder']
+    classifier = JavaClassImpl@296['StringBuilder']
     nullable = 'true': Boolean@125
     typeConstructor = LazyJavaClassTypeConstructor@61['StringBuilder']
 }
@@ -843,28 +835,26 @@ LazyJavaPackageFragmentProvider@342 {
     packageFragments('kotlin.jvm': FqName@362) = null
     packageFragments('str': FqName@363) = null
     topLevelClasses(JavaClassImpl@82['AbstractStringBuilder']) = LazyJavaClassDescriptor@2['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@153['Appendable']) = LazyJavaClassDescriptor@21['Appendable']
-    topLevelClasses(JavaClassImpl@229['Serializable']) = LazyJavaClassDescriptor@35['Serializable']
-    topLevelClasses(JavaClassImpl@262['StringBuffer']) = LazyJavaClassDescriptor@42['StringBuffer']
-    topLevelClasses(JavaClassImpl@364['StringBuilder']) = LazyJavaClassDescriptor@44['StringBuilder']
+    topLevelClasses(JavaClassImpl@153['Appendable']) = LazyJavaClassDescriptor@19['Appendable']
+    topLevelClasses(JavaClassImpl@229['Serializable']) = LazyJavaClassDescriptor@33['Serializable']
+    topLevelClasses(JavaClassImpl@262['StringBuffer']) = LazyJavaClassDescriptor@40['StringBuffer']
+    topLevelClasses(JavaClassImpl@364['StringBuilder']) = LazyJavaClassDescriptor@42['StringBuilder']
 }
 
 LazyJavaPackageFragment@344['<root>'] {
     classes('String': Name@365) = null // through LazyPackageFragmentScopeForJavaPackage@366
     classes('StringBuilder': Name@367) = null // through LazyPackageFragmentScopeForJavaPackage@366
     classes('Unit': Name@368) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('append': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@366
+    classes('append': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@366
     classes('init': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@366
     classes('invoke': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@366
     classes('string': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@366
-    classes('toString': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@366
     deserializedPackageScope = Empty@371 // through LazyPackageFragmentScopeForJavaPackage@366
     functions('StringBuilder': Name@372) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
-    functions('append': Name@17) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
+    functions('append': Name@50) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
     functions('init': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
     functions('invoke': Name@369) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
     functions('string': Name@370) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
-    functions('toString': Name@18) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@366
     memberIndex = computeMemberIndex$1@373 // through LazyPackageFragmentScopeForJavaPackage@366
 }
 
@@ -876,18 +866,122 @@ LazyJavaPackageFragment@349['java'] {
 }
 
 LazyJavaPackageFragment@353['lang'] {
-    classes('StringBuilder': Name@367) = LazyJavaClassDescriptor@44['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@378
-    classes('append': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@378
+    classes('StringBuilder': Name@367) = LazyJavaClassDescriptor@42['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@378
+    classes('append': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@378
     classes('init': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@378
     classes('invoke': Name@369) = null // through LazyPackageFragmentScopeForJavaPackage@378
     classes('string': Name@370) = null // through LazyPackageFragmentScopeForJavaPackage@378
-    classes('toString': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@378
     deserializedPackageScope = Empty@371 // through LazyPackageFragmentScopeForJavaPackage@378
     functions('StringBuilder': Name@372) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('append': Name@17) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
+    functions('append': Name@50) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
     functions('init': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
     functions('invoke': Name@369) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
     functions('string': Name@370) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
-    functions('toString': Name@18) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@378
     memberIndex = computeMemberIndex$1@379 // through LazyPackageFragmentScopeForJavaPackage@378
 }
+
+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]
+    <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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@11[empty]
+    <name not found> = EmptyList@11[empty]
+}
+
+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]
+    <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, ... }
+    <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 6f277646a6b..2585b6ebab3 100644
--- a/compiler/testData/diagnostics/tests/labels/kt591.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/kt591.lazy.log
@@ -17,25 +17,37 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('times': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('times': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('times': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('times': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <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 4123dd45a27..6bd608f1207 100644
--- a/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/labelReferencesInsideObjectExpressions.lazy.log
@@ -21,23 +21,19 @@ LazyJavaPackageFragmentProvider@4 {
     packageFragments('kotlin.jvm': FqName@19) = null
 }
 
-LazyJavaPackageFragment@6['<root>'] {
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('bar': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@21
-}
-
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    classes('bar': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('bar': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log b/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
index ba566e87d5e..cc91bb8bba1 100644
--- a/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
+++ b/compiler/testData/diagnostics/tests/labels/labelsMustBeNamed.lazy.log
@@ -30,28 +30,77 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Unit': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('bar': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('bar': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['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@13['lang'] {
-    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('bar': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('foo': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('bar': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('equals': Name@30) = 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@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]
+}
+
+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@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 }
+}
+
+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> = ArrayList@76[1] { ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[1] { ResolutionCandidate@77 }
 }
diff --git a/compiler/testData/diagnostics/tests/library/Collections.lazy.log b/compiler/testData/diagnostics/tests/library/Collections.lazy.log
index 4bf5214fa20..45cc382c5b0 100644
--- a/compiler/testData/diagnostics/tests/library/Collections.lazy.log
+++ b/compiler/testData/diagnostics/tests/library/Collections.lazy.log
@@ -87,43 +87,1577 @@ LazyJavaPackageFragment@41['lang'] {
     classes('add': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
     classes('addAll': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@86
     classes('clear': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('contains': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('containsAll': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('entrySet': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('get': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('indexOf': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('isEmpty': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('iterator': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('keySet': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('lastIndexOf': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('listIterator': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('remove': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('removeAll': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('retainAll': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('set': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('size': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('subList': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('values': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('remove': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('removeAll': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('retainAll': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('set': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@86
     deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@86
     functions('add': Name@85) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     functions('addAll': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     functions('clear': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('contains': Name@89) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('containsAll': Name@90) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('entrySet': Name@91) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('get': Name@92) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('indexOf': Name@93) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('isEmpty': Name@94) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('iterator': Name@95) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('keySet': Name@96) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lastIndexOf': Name@97) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('listIterator': Name@98) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('remove': Name@99) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('removeAll': Name@100) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('retainAll': Name@101) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('set': Name@102) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('size': Name@103) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('subList': Name@104) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('values': Name@105) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('remove': Name@89) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('removeAll': Name@90) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('retainAll': Name@91) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('set': Name@92) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@86
+}
+
+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> = 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[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 }
+}
+
+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 }
+}
+
+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[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 }
+}
+
+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> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+}
+
+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@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@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@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[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@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[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@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@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+}
+
+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@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+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[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[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@510 {
+    <name not found> = ArrayList@511[1] { ResolutionCandidate@512 }
+    <name not found> = ArrayList@513[1] { ResolutionCandidate@512 }
+}
+
+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@522 {
+    <name not found> = ArrayList@523[1] { ResolutionCandidate@524 }
+    <name not found> = ArrayList@525[1] { ResolutionCandidate@524 }
+}
+
+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@534 {
+    <name not found> = ArrayList@535[1] { ResolutionCandidate@536 }
+    <name not found> = ArrayList@537[1] { ResolutionCandidate@536 }
+}
+
+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@546 {
+    <name not found> = ArrayList@547[1] { ResolutionCandidate@548 }
+    <name not found> = ArrayList@549[1] { ResolutionCandidate@548 }
+}
+
+ResolutionTaskHolder@550 {
+    <name not found> = ArrayList@551[1] { ResolutionCandidate@552 }
+    <name not found> = ArrayList@553[1] { ResolutionCandidate@552 }
+}
+
+ResolutionTaskHolder@554 {
+    <name not found> = ArrayList@555[1] { ResolutionCandidate@556 }
+    <name not found> = ArrayList@557[1] { ResolutionCandidate@556 }
+}
+
+ResolutionTaskHolder@558 {
+    <name not found> = ArrayList@559[1] { ResolutionCandidate@560 }
+    <name not found> = ArrayList@561[1] { ResolutionCandidate@560 }
+}
+
+ResolutionTaskHolder@562 {
+    <name not found> = ArrayList@563[1] { ResolutionCandidate@564 }
+    <name not found> = ArrayList@565[1] { ResolutionCandidate@564 }
+}
+
+ResolutionTaskHolder@566 {
+    <name not found> = ArrayList@567[1] { ResolutionCandidate@568 }
+    <name not found> = ArrayList@569[1] { ResolutionCandidate@568 }
+}
+
+ResolutionTaskHolder@570 {
+    <name not found> = ArrayList@571[1] { ResolutionCandidate@572 }
+    <name not found> = ArrayList@573[1] { ResolutionCandidate@572 }
+}
+
+ResolutionTaskHolder@574 {
+    <name not found> = ArrayList@575[1] { ResolutionCandidate@576 }
+    <name not found> = ArrayList@577[1] { ResolutionCandidate@576 }
+}
+
+ResolutionTaskHolder@578 {
+    <name not found> = ArrayList@579[1] { ResolutionCandidate@580 }
+    <name not found> = ArrayList@581[1] { ResolutionCandidate@580 }
+}
+
+ResolutionTaskHolder@582 {
+    <name not found> = ArrayList@583[1] { ResolutionCandidate@584 }
+    <name not found> = ArrayList@585[1] { ResolutionCandidate@584 }
+}
+
+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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@753 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@754 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@755 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@756 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@757 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@758 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@759 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@760 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@761 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@762 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@763 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@764 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@765 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@766 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@767 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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/library/kt828.lazy.log b/compiler/testData/diagnostics/tests/library/kt828.lazy.log
index 1911f42fe71..9120b1b9a26 100644
--- a/compiler/testData/diagnostics/tests/library/kt828.lazy.log
+++ b/compiler/testData/diagnostics/tests/library/kt828.lazy.log
@@ -12,34 +12,106 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Boolean': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('and': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('not': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('or': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('xor': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('and': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('not': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('or': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('xor': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('and': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('not': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('or': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('xor': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('and': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('not': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('or': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('xor': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+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@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@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@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 }
+}
+
+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 }
+}
+
+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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/collectionMethodStub.lazy.log
index 2e574e8c23b..d81db424d0b 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@27['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
 
 LazyJavaClassifierType@36['String'] {
     arguments = ArrayList@37[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@35
     typeConstructor = DeserializedClassTypeConstructor@29
 }
@@ -151,3 +151,66 @@ LazyJavaPackageFragment@62['lang'] {
     functions('UnsupportedOperationException': Name@80) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@88
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
+
+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]
+    <name not found> = EmptyList@82[empty]
+    <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@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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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@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@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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 ae23535e8eb..8876b315ada 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArguments.lazy.log
@@ -41,7 +41,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('p': FqName@43) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@20['<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@20['<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@20['<root>'] {
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@35['<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
@@ -74,21 +74,21 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
-LazyJavaPackageFragment@23['java'] {
+LazyJavaPackageFragment@37['java'] {
     classes('lang': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@57
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@57
     functions('lang': Name@58) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@57
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@23['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@37['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@25['lang'] {
     memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@8['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@8['lang'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@39['lang'] {
+LazyJavaPackageFragment@8['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
@@ -123,3 +123,61 @@ LazyJavaPackageFragment@39['lang'] {
     functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
+
+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]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@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]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/differentGenericArgumentsReversed.lazy.log
index 5c111048888..0281ef558ea 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@21['<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@21['<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@21['<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@24['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@24['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
@@ -123,3 +123,61 @@ LazyJavaPackageFragment@39['lang'] {
     functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
+
+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]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@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]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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@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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateClass.lazy.log
index 1869d30573e..43a7a7a2bbd 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@20['<root>'] {
+LazyJavaPackageFragment@34['<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@20['<root>'] {
     memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
-LazyJavaPackageFragment@34['<root>'] {
+LazyJavaPackageFragment@20['<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
@@ -82,14 +82,14 @@ LazyJavaPackageFragment@23['java'] {
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@8['java'] {
+LazyJavaPackageFragment@36['java'] {
     classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@60
     functions('lang': Name@61) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
-LazyJavaPackageFragment@36['java'] {
+LazyJavaPackageFragment@8['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
@@ -110,19 +110,76 @@ LazyJavaPackageFragment@10['lang'] {
 LazyJavaPackageFragment@25['lang'] {
     classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@70
     classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('plus': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@70
     deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@70
     functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('plus': Name@71) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@38['lang'] {
-    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('B': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('foo': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('B': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('foo': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
+}
+
+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]
+    <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@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]
+    <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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
index dcd5dec791e..af68d91af2d 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateNestedClasses.lazy.log
@@ -45,10 +45,10 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('kotlin.io': FqName@41) = null
     packageFragments('kotlin.jvm': FqName@42) = null
     packageFragments('p': FqName@43) = null
-    packageFragments('p.M1': FqName@33) = null
+    packageFragments('p.M1': FqName@18) = null
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@2['<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
@@ -70,7 +70,7 @@ LazyJavaPackageFragment@35['<root>'] {
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@20['<root>'] {
+LazyJavaPackageFragment@35['<root>'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
     classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
@@ -92,7 +92,7 @@ LazyJavaPackageFragment@20['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@20['<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
@@ -114,7 +114,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
-LazyJavaPackageFragment@37['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
     deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
     functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
@@ -128,19 +128,15 @@ LazyJavaPackageFragment@23['java'] {
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@37['java'] {
     classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@71
     functions('lang': Name@72) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@8['lang'] {
+LazyJavaPackageFragment@25['lang'] {
     classes('A': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('D': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('F': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('G': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@75
@@ -150,10 +146,6 @@ LazyJavaPackageFragment@8['lang'] {
     classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@75
     deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@75
     functions('A': Name@74) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('B': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('D': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('F': Name@78) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('G': Name@79) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
@@ -161,43 +153,362 @@ LazyJavaPackageFragment@8['lang'] {
     functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
     functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@25['lang'] {
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
+LazyJavaPackageFragment@8['lang'] {
+    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@39['lang'] {
-    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('a': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('b': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('c': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('d': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('e': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('f': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('g': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('a': Name@46) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('b': Name@47) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('c': Name@48) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('d': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('e': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('f': Name@51) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('g': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
+}
+
+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]
+    <name not found> = EmptyList@55[empty]
+    <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@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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@89 {
+    <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]
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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> = 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]
+    <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 }
+    <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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@125 {
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[1] { ResolutionCandidate@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]
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@55[empty]
+}
+
+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@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@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@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 }
+}
+
+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> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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 ee8b763fa98..d323c627c60 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/duplicateSuperClass.lazy.log
@@ -81,14 +81,14 @@ LazyJavaPackageFragment@37['java'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
-LazyJavaPackageFragment@24['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@24['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@39['lang'] {
+LazyJavaPackageFragment@26['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@39['lang'] {
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@26['lang'] {
+LazyJavaPackageFragment@39['lang'] {
     classes('M1': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('foo': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@73
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@73
@@ -123,3 +123,47 @@ LazyJavaPackageFragment@26['lang'] {
     functions('foo': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@73
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
+
+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]
+    <name not found> = EmptyList@49[empty]
+    <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@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]
+}
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericArgumentNumberMismatch.lazy.log
index 7ca2fb85b1c..1e462aed01d 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@2['<root>'] {
+LazyJavaPackageFragment@39['<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@2['<root>'] {
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
-LazyJavaPackageFragment@39['<root>'] {
+LazyJavaPackageFragment@2['<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
@@ -127,3 +127,56 @@ LazyJavaPackageFragment@43['lang'] {
     functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
 }
+
+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]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
index 26fde35e768..a29df972954 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/genericSuperClass.lazy.log
@@ -65,7 +65,7 @@ LazyJavaPackageFragmentProvider@58 {
     packageFragments('p': FqName@67) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@33['<root>'] {
     classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
@@ -80,7 +80,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
-LazyJavaPackageFragment@33['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('M1': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('a': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
     classes('c': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@78
@@ -171,3 +171,121 @@ LazyJavaPackageFragment@63['lang'] {
     functions('d': Name@72) = EmptyList@75[empty] // through LazyPackageFragmentScopeForJavaPackage@99
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
 }
+
+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]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@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]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@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]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@75[empty]
+    <name not found> = EmptyList@75[empty]
+}
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
index 0a67414b713..f90b22c2a02 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsage.lazy.log
@@ -44,19 +44,60 @@ LazyJavaPackageFragment@5['java'] {
 LazyJavaPackageFragment@7['lang'] {
     classes('A': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('B': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('foo': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@41
     functions('A': Name@40) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     functions('B': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('foo': Name@43) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@22['lang'] {
-    classes('B': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('B': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@43) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('B': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('B': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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]
+    <name not found> = EmptyList@34[empty]
+    <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> = ArrayList@53[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]
+}
+
+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[1] { ResolutionCandidate@64 }
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@64 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/inTheSameModuleWithUsageNoTypeAnnotation.lazy.log
index 0fa290ca337..5f2926ecb00 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@5['java'] {
+LazyJavaPackageFragment@19['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@19['java'] {
+LazyJavaPackageFragment@5['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
@@ -57,3 +57,94 @@ LazyJavaPackageFragment@21['lang'] {
     functions('foo': Name@40) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
 }
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <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@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 }
+}
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 7610fba8819..e92d62ead87 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/members.lazy.log
@@ -46,110 +46,176 @@ LazyJavaPackageFragment@2['<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
-    classes('m1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('m2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('M1': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('M2': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('m1': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('m2': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('p': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+LazyJavaPackageFragment@32['<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
+    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('p': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
 LazyJavaPackageFragment@17['<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
-    classes('m1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('m2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('M1': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('M2': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('m1': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('m2': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('p': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('p': Name@52) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@32['<root>'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('m1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('m2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('p': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('M1': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('M2': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('m1': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('m2': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('p': Name@54) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+LazyJavaPackageFragment@5['java'] {
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@20['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
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('lang': Name@64) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
 LazyJavaPackageFragment@35['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
-}
-
-LazyJavaPackageFragment@5['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
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('lang': Name@68) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('A': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('m1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('m2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('A': Name@72) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('M1': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('M2': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('m1': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('m2': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('A': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('A': Name@70) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@22['lang'] {
-    classes('A': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('m1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('m2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('A': Name@75) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('M1': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('M2': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('m1': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('m2': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('A': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('A': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
 LazyJavaPackageFragment@37['lang'] {
-    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('m1': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('m2': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('M1': Name@47) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('M2': Name@48) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('m1': Name@49) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('m2': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('M1': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('M2': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('M1': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('M2': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
+}
+
+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]
+    <name not found> = EmptyList@51[empty]
+    <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@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]
+}
+
+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]
+}
+
+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@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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameClassNameDifferentPackages.lazy.log
index fa20df57eb8..3345dd289b0 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@5['java'] {
+LazyJavaPackageFragment@20['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@20['java'] {
+LazyJavaPackageFragment@5['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
@@ -74,3 +74,38 @@ LazyJavaPackageFragment@22['lang'] {
     functions('B': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
 }
+
+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]
+    <name not found> = EmptyList@34[empty]
+    <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> = 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]
+}
+
+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/multimodule/duplicateClass/sameGenericArguments.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateClass/sameGenericArguments.lazy.log
index 26e9d40fe74..817af33ae8c 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@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
@@ -67,7 +67,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@21['<root>'] {
+LazyJavaPackageFragment@39['<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,14 +78,14 @@ LazyJavaPackageFragment@21['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@41['java'] {
+LazyJavaPackageFragment@25['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
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
-LazyJavaPackageFragment@25['java'] {
+LazyJavaPackageFragment@41['java'] {
     classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@65
     functions('lang': Name@66) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@65
@@ -127,3 +127,47 @@ LazyJavaPackageFragment@27['lang'] {
     functions('foo': Name@50) = EmptyList@53[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
 }
+
+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]
+    <name not found> = EmptyList@53[empty]
+    <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@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]
+    <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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
index 9b41b409d33..2de4d794b55 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParams.lazy.log
@@ -99,83 +99,71 @@ 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
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('lang': Name@96) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
+    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'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
+    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@10['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
+LazyJavaPackageFragment@49['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@34['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@104
+LazyJavaPackageFragment@61['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
+    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
-LazyJavaPackageFragment@51['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@106
+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[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
index 469f02dad5f..c110206ae0d 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsBoundMismatch.lazy.log
@@ -95,87 +95,75 @@ LazyJavaPackageFragmentProvider@61 {
     packageFragments('p.X': FqName@49) = null
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@51['<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
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('p': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('p': Name@84) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('p': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
+}
+
+LazyJavaPackageFragment@28['<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
+    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('p': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('p': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('p': Name@84) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@51['<root>'] {
-    classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('p': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('p': Name@84) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('lang': Name@96) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('B': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('C': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Tr': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('p': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('p': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('lang': Name@104) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
+    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@55['lang'] {
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@106
+LazyJavaPackageFragment@53['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@35['lang'] {
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
+LazyJavaPackageFragment@65['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@10['lang'] {
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+LazyJavaPackageFragment@33['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
+    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@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[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
+    <name not found> = ArrayList@118[3] { ResolutionCandidate@115, ResolutionCandidate@116, ResolutionCandidate@117 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
index 1068592d97c..2f69ec0a2c9 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsIndexMismatch.lazy.log
@@ -115,84 +115,72 @@ LazyJavaPackageFragmentProvider@65 {
     packageFragments('p._': FqName@53) = null
 }
 
-LazyJavaPackageFragment@32['<root>'] {
+LazyJavaPackageFragment@55['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@87) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@81
-}
-
-LazyJavaPackageFragment@55['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('p': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('p': Name@87) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('p': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('p': Name@87) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
+LazyJavaPackageFragment@32['<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
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
+    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@90
+    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
-}
-
-LazyJavaPackageFragment@69['java'] {
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('lang': Name@103) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
+    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'] {
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('lang': Name@107) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
+    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@59['lang'] {
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
+LazyJavaPackageFragment@69['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@39['lang'] {
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@111
+LazyJavaPackageFragment@37['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
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
-LazyJavaPackageFragment@11['lang'] {
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
+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[3] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[3] { ResolutionCandidate@118, ResolutionCandidate@119, ResolutionCandidate@120 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
index 404a761bab3..d869cf1c8f6 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInParamsNameMismatch.lazy.log
@@ -95,84 +95,77 @@ 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('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@79) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('foo': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@79) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('p': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('foo': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('p': Name@79) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('p': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('p': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@91) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
+LazyJavaPackageFragment@28['<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
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('p': Name@77) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
 LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
+    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'] {
+    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('lang': Name@90) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
+}
+
+LazyJavaPackageFragment@8['java'] {
+    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('lang': Name@94) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
 LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
+    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    deserializedPackageScope = Empty@76 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('lang': Name@98) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@34['lang'] {
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('foo': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('foo': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@103
+ResolutionTaskHolder@104 {
+    <name not found> = ArrayList@105[1] { ResolutionCandidate@106 }
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@106 }
 }
 
-LazyJavaPackageFragment@51['lang'] {
-    classes('foo': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('foo': Name@75) = EmptyList@78[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@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[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[3] { ResolutionCandidate@114, ResolutionCandidate@115, ResolutionCandidate@116 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
index 2c3d5696482..8e711a5b02e 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classGenericsInReturnType.lazy.log
@@ -95,87 +95,75 @@ LazyJavaPackageFragmentProvider@57 {
     packageFragments('p.X': FqName@45) = null
 }
 
-LazyJavaPackageFragment@47['<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
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+LazyJavaPackageFragment@47['<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
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
+    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@32['java'] {
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('lang': Name@96) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
+    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'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
+    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@51['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
+LazyJavaPackageFragment@61['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
+    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
-LazyJavaPackageFragment@34['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@104
+ResolutionTaskHolder@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@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[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
+    <name not found> = ArrayList@114[3] { ResolutionCandidate@111, ResolutionCandidate@112, ResolutionCandidate@113 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
index 6701fb8bc32..2813272e590 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/classVsFunctionGenericsInParamsMismatch.lazy.log
@@ -95,84 +95,92 @@ LazyJavaPackageFragmentProvider@69 {
     packageFragments('p.C': FqName@66) = null
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@70['<root>'] {
     classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
     classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    classes('p': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('p': Name@87) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@81
+}
+
+LazyJavaPackageFragment@47['<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
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('p': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('p': Name@87) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
-}
-
-LazyJavaPackageFragment@70['<root>'] {
-    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('p': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('p': Name@87) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@52['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@72['java'] {
-    classes('lang': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('lang': Name@99) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
+    classes('B': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('C': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
+    functions('p': Name@85) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@90
+    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('lang': Name@103) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
+    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@32['java'] {
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('lang': Name@107) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
+    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@54['lang'] {
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
+LazyJavaPackageFragment@52['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@10['lang'] {
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@111
+LazyJavaPackageFragment@72['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
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
-LazyJavaPackageFragment@74['lang'] {
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@85 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@83) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
+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 }
+}
+
+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[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[3] { ResolutionCandidate@134, ResolutionCandidate@135, ResolutionCandidate@136 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
index f68fc78e235..47fb03383cc 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/covariantReturnTypes.lazy.log
@@ -71,84 +71,72 @@ LazyJavaPackageFragmentProvider@49 {
     packageFragments('p.C': FqName@48) = null
 }
 
-LazyJavaPackageFragment@35['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('p': Name@70) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
+}
+
+LazyJavaPackageFragment@35['<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
+    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('p': Name@70) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('p': Name@70) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
-}
-
-LazyJavaPackageFragment@53['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@26['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    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'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    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'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
+    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@28['lang'] {
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@92
+LazyJavaPackageFragment@53['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
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@40['lang'] {
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
+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[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[3] { ResolutionCandidate@101, ResolutionCandidate@102, ResolutionCandidate@103 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
index 0ea96aba4f0..d13eb78ceec 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differenceInParamNames.lazy.log
@@ -91,84 +91,72 @@ LazyJavaPackageFragmentProvider@64 {
     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('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
+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
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
 LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
+    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'] {
+    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'] {
-    classes('lang': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('lang': Name@109) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@108
+    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'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-LazyJavaPackageFragment@56['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@117
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-LazyJavaPackageFragment@35['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
index 16143ed92b7..2c5ff109a0f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentGenericsInParams.lazy.log
@@ -153,109 +153,88 @@ LazyJavaPackageFragmentProvider@107 {
     packageFragments('p.String': FqName@38) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@40['<root>'] {
     classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@120
     classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('p': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('p': Name@126) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@120
-}
-
-LazyJavaPackageFragment@40['<root>'] {
-    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('p': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('p': Name@126) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@128
-}
-
-LazyJavaPackageFragment@97['<root>'] {
-    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('p': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('p': Name@126) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@120
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@120
+    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@120
+    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@120
 }
 
 LazyJavaPackageFragment@67['<root>'] {
-    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('p': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('p': Name@126) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('B': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('C': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('p': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@127
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@127
 }
 
-LazyJavaPackageFragment@99['java'] {
-    classes('lang': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('lang': Name@136) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@135
+LazyJavaPackageFragment@2['<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
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@129
+    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@129
+    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@129
+}
+
+LazyJavaPackageFragment@97['<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
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('p': Name@124) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
 LazyJavaPackageFragment@74['java'] {
-    classes('lang': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('lang': Name@140) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@139
+    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@11['java'] {
-    classes('lang': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@143
-    functions('lang': Name@144) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@143
-}
-
-LazyJavaPackageFragment@110['java'] {
-    classes('lang': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('lang': Name@148) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@147
+LazyJavaPackageFragment@99['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'] {
-    classes('lang': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('lang': Name@152) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@151
+    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@13['lang'] {
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@154
+LazyJavaPackageFragment@11['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
+    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@146
 }
 
-LazyJavaPackageFragment@101['lang'] {
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@157 // through LazyPackageFragmentScopeForJavaPackage@156
+LazyJavaPackageFragment@110['java'] {
+    classes('lang': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    deserializedPackageScope = Empty@123 // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('lang': Name@151) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@150
 }
 
-LazyJavaPackageFragment@48['lang'] {
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@158
+ResolutionTaskHolder@153 {
+    <name not found> = ArrayList@154[1] { ResolutionCandidate@155 }
+    <name not found> = ArrayList@156[1] { ResolutionCandidate@155 }
 }
 
-LazyJavaPackageFragment@76['lang'] {
-    classes('foo': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@160
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@160
-    functions('foo': Name@122) = EmptyList@125[empty] // through LazyPackageFragmentScopeForJavaPackage@160
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@160
+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[3] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165 }
+    <name not found> = ArrayList@166[3] { ResolutionCandidate@163, ResolutionCandidate@164, ResolutionCandidate@165 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentNumberOfParams.lazy.log
index e5b4e7fe770..f0797430a29 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@24) = null
+    packageFragments('p.C': FqName@47) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,89 +86,77 @@ 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@28['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
+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
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
-}
-
-LazyJavaPackageFragment@70['java'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
+    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'] {
-    classes('lang': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('lang': Name@109) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@108
+    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'] {
+    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'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
 }
 
-LazyJavaPackageFragment@35['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@117
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-LazyJavaPackageFragment@56['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
index e31e9e06771..fde987cfb14 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/differentReturnTypes.lazy.log
@@ -22,38 +22,38 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragmentProvider@23 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@24['<root>']
-    packageFragments('B': FqName@3) = null
+    packageFragments('B': FqName@25) = null
     packageFragments('C': FqName@4) = null
-    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    packageFragments('java.lang.B': FqName@10) = 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@11) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.B': FqName@14) = null
+    packageFragments('kotlin': FqName@31) = null
+    packageFragments('kotlin.B': FqName@32) = null
     packageFragments('kotlin.C': FqName@15) = 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@21) = 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@3) = null
     packageFragments('C': FqName@4) = 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@10) = null
     packageFragments('java.lang.C': FqName@11) = null
-    packageFragments('kotlin': FqName@42) = null
-    packageFragments('kotlin.B': FqName@43) = null
+    packageFragments('kotlin': FqName@44) = null
+    packageFragments('kotlin.B': FqName@14) = null
     packageFragments('kotlin.C': FqName@15) = 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@21) = null
 }
 
 LazyJavaPackageFragmentProvider@49 {
@@ -68,87 +68,75 @@ 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>'] {
+LazyJavaPackageFragment@39['<root>'] {
     classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
     classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('p': Name@70) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('p': Name@70) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@35['<root>'] {
-    classes('B': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('C': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('p': Name@70) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
+LazyJavaPackageFragment@24['<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
+    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('p': Name@68) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@26['java'] {
-    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
+LazyJavaPackageFragment@27['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'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    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'] {
+    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@7['java'] {
-    classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@86) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
+    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@88
+    functions('lang': Name@89) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@88
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
 }
 
-LazyJavaPackageFragment@28['lang'] {
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@92
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
 }
 
-LazyJavaPackageFragment@40['lang'] {
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
-}
-
-LazyJavaPackageFragment@9['lang'] {
-    classes('getParent': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('getParent': Name@66) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
index fd0e627fff5..7430a261c25 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/extensionMatch.lazy.log
@@ -79,84 +79,66 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('p.String': FqName@73) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
     classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('getParent': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@75
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('getParent': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('p': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
 LazyJavaPackageFragment@43['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('getParent': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('C': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('p': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@46['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@61['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
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
+LazyJavaPackageFragment@2['<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
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('p': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
 }
 
 LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('lang': Name@97) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
+    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'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
+    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@48['lang'] {
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('getParent': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@103
+LazyJavaPackageFragment@46['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
+    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('getParent': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@105
+LazyJavaPackageFragment@61['java'] {
+    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('lang': Name@100) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-LazyJavaPackageFragment@30['lang'] {
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('getParent': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
+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]
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
index 77761869ce6..adefdb418c0 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParams.lazy.log
@@ -91,87 +91,90 @@ LazyJavaPackageFragmentProvider@60 {
     packageFragments('p.T': FqName@77) = null
 }
 
-LazyJavaPackageFragment@47['<root>'] {
+LazyJavaPackageFragment@28['<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
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@86) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
+}
+
+LazyJavaPackageFragment@47['<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
+    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('p': Name@86) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
-}
-
-LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('p': Name@86) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('lang': Name@102) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@106) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
+    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@34['lang'] {
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
+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@52['lang'] {
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+LazyJavaPackageFragment@32['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
+    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@112
+LazyJavaPackageFragment@50['java'] {
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
+}
+
+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[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
index 223e6a7cab4..c0c35207603 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsBoundsMismatch.lazy.log
@@ -94,7 +94,7 @@ LazyJavaPackageFragment@47['<root>'] {
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@28['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
@@ -105,7 +105,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
-LazyJavaPackageFragment@28['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
@@ -123,14 +123,14 @@ LazyJavaPackageFragment@8['java'] {
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@50['java'] {
+LazyJavaPackageFragment@65['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@65['java'] {
+LazyJavaPackageFragment@50['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
@@ -144,14 +144,14 @@ LazyJavaPackageFragment@32['java'] {
     memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
-LazyJavaPackageFragment@34['lang'] {
+LazyJavaPackageFragment@52['lang'] {
     classes('foo': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@107
     deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@107
     functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
-LazyJavaPackageFragment@52['lang'] {
+LazyJavaPackageFragment@34['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
@@ -164,3 +164,46 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@111
     memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@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[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]
+    <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]
+    <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]
+    <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 c7036c1696a..7d1d6057af4 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsEqNull.lazy.log
@@ -80,96 +80,180 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('p.T': FqName@73) = null
 }
 
-LazyJavaPackageFragment@25['<root>'] {
+LazyJavaPackageFragment@43['<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
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('p': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('p': Name@82) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@75
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('p': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('p': Name@82) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-LazyJavaPackageFragment@43['<root>'] {
-    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('p': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('p': Name@82) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
-}
-
-LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('lang': Name@90) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
+LazyJavaPackageFragment@25['<root>'] {
+    classes('B': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('p': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('p': Name@81) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
+    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'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('lang': Name@93) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
 LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('lang': Name@102) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
+    classes('lang': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('lang': Name@97) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('foo': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@104
-}
-
-LazyJavaPackageFragment@31['lang'] {
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@106
+LazyJavaPackageFragment@46['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
+    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('equals': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@103
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@103
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@103
+    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@103
+}
+
+LazyJavaPackageFragment@31['lang'] {
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@105
+}
+
+LazyJavaPackageFragment@9['lang'] {
+    classes('equals': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@79 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('equals': Name@77) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
+}
+
+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> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@116 {
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@118 }
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@118 }
+    <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> = EmptyList@80[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+    <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@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> = 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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsNotIs.lazy.log
index d02ba3bbf55..f8d75abcd86 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@44) = null
+    packageFragments('p.C': FqName@24) = 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@24) = null
+    packageFragments('p.C': FqName@44) = null
     packageFragments('p.T': FqName@77) = null
 }
 
@@ -95,83 +95,86 @@ LazyJavaPackageFragment@2['<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
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@86) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@79
+    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
 LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('p': Name@86) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
+    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('p': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('p': Name@86) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('B': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('C': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('p': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('p': Name@84) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
 }
 
 LazyJavaPackageFragment@65['java'] {
-    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('lang': Name@94) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
-}
-
-LazyJavaPackageFragment@50['java'] {
-    classes('lang': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('lang': Name@98) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
+    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'] {
-    classes('lang': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('lang': Name@102) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
+    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'] {
-    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('lang': Name@106) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('lang': Name@101) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
 }
 
-LazyJavaPackageFragment@34['lang'] {
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
+LazyJavaPackageFragment@50['java'] {
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
-LazyJavaPackageFragment@52['lang'] {
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+ResolutionTaskHolder@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('foo': Name@82) = EmptyList@85[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@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[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+    <name not found> = ArrayList@128[3] { ResolutionCandidate@125, ResolutionCandidate@126, ResolutionCandidate@127 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
index 08f76e0a476..b29bd142da4 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnFooT.lazy.log
@@ -60,45 +60,45 @@ LazyJavaPackageFragmentProvider@31 {
 
 LazyJavaPackageFragmentProvider@54 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@55['<root>']
-    packageFragments('B': FqName@33) = null
+    packageFragments('B': FqName@3) = null
     packageFragments('C': FqName@4) = null
     packageFragments('String': FqName@6) = null
     packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
     packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.B': FqName@40) = null
+    packageFragments('java.lang.B': FqName@12) = null
     packageFragments('java.lang.C': FqName@13) = null
     packageFragments('java.lang.String': FqName@15) = null
     packageFragments('kotlin': FqName@60) = null
-    packageFragments('kotlin.B': FqName@44) = null
+    packageFragments('kotlin.B': FqName@18) = null
     packageFragments('kotlin.C': FqName@19) = null
     packageFragments('kotlin.String': FqName@21) = null
     packageFragments('kotlin.io': FqName@61) = null
     packageFragments('kotlin.jvm': FqName@62) = null
     packageFragments('p': FqName@63) = null
     packageFragments('p.B': FqName@64) = null
-    packageFragments('p.C': FqName@51) = null
+    packageFragments('p.C': FqName@27) = null
     packageFragments('p.String': FqName@29) = null
 }
 
 LazyJavaPackageFragmentProvider@65 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@66['<root>']
-    packageFragments('B': FqName@3) = null
+    packageFragments('B': FqName@33) = null
     packageFragments('Foo': FqName@67) = null
     packageFragments('T': FqName@68) = null
     packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
     packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
-    packageFragments('java.lang.B': FqName@12) = null
+    packageFragments('java.lang.B': FqName@40) = null
     packageFragments('java.lang.Foo': FqName@73) = null
     packageFragments('java.lang.T': FqName@74) = null
     packageFragments('kotlin': FqName@75) = null
-    packageFragments('kotlin.B': FqName@18) = null
+    packageFragments('kotlin.B': FqName@44) = null
     packageFragments('kotlin.Foo': FqName@76) = null
     packageFragments('kotlin.T': FqName@77) = null
     packageFragments('kotlin.io': FqName@78) = null
     packageFragments('kotlin.jvm': FqName@79) = null
     packageFragments('p': FqName@80) = null
     packageFragments('p.B': FqName@81) = null
-    packageFragments('p.C': FqName@27) = null
+    packageFragments('p.C': FqName@51) = null
     packageFragments('p.Foo': FqName@82) = null
     packageFragments('p.T': FqName@83) = null
 }
@@ -107,83 +107,86 @@ LazyJavaPackageFragment@32['<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
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('p': Name@92) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('p': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('p': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('p': Name@92) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    classes('p': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('p': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
 LazyJavaPackageFragment@55['<root>'] {
-    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    functions('p': Name@92) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@96
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
-}
-
-LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
-}
-
-LazyJavaPackageFragment@37['java'] {
-    classes('lang': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@103
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@103
-    functions('lang': Name@104) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@103
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@103
+    classes('B': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('C': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('String': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('p': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    deserializedPackageScope = Empty@89 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('p': Name@90) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    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'] {
-    classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('lang': Name@112) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
+    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@11['lang'] {
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@114
+LazyJavaPackageFragment@9['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@39['lang'] {
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
+LazyJavaPackageFragment@37['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
+    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
-LazyJavaPackageFragment@59['lang'] {
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+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 }
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
index de8096b042f..dd08980e41f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/functionGenericsInParamsReturnT.lazy.log
@@ -52,126 +52,129 @@ LazyJavaPackageFragmentProvider@27 {
 
 LazyJavaPackageFragmentProvider@46 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@47['<root>']
-    packageFragments('B': FqName@29) = null
+    packageFragments('B': FqName@3) = null
     packageFragments('C': FqName@4) = null
     packageFragments('String': FqName@5) = null
     packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
     packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    packageFragments('java.lang.B': FqName@35) = null
+    packageFragments('java.lang.B': FqName@11) = null
     packageFragments('java.lang.C': FqName@12) = null
     packageFragments('java.lang.String': FqName@13) = null
     packageFragments('kotlin': FqName@52) = null
-    packageFragments('kotlin.B': FqName@38) = null
+    packageFragments('kotlin.B': FqName@16) = null
     packageFragments('kotlin.C': FqName@17) = null
     packageFragments('kotlin.String': FqName@18) = null
     packageFragments('kotlin.io': FqName@53) = null
     packageFragments('kotlin.jvm': FqName@54) = null
     packageFragments('p': FqName@55) = null
     packageFragments('p.B': FqName@56) = null
-    packageFragments('p.C': FqName@44) = null
+    packageFragments('p.C': FqName@24) = null
     packageFragments('p.String': FqName@25) = null
 }
 
 LazyJavaPackageFragmentProvider@57 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('B': FqName@3) = null
+    packageFragments('B': FqName@29) = null
     packageFragments('T': FqName@59) = null
     packageFragments('java': FqName@60) = LazyJavaPackageFragment@61['java']
     packageFragments('java.lang': FqName@62) = LazyJavaPackageFragment@63['lang']
-    packageFragments('java.lang.B': FqName@11) = null
+    packageFragments('java.lang.B': FqName@35) = null
     packageFragments('java.lang.T': FqName@64) = null
     packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.B': FqName@16) = null
+    packageFragments('kotlin.B': FqName@38) = null
     packageFragments('kotlin.T': FqName@66) = null
     packageFragments('kotlin.io': FqName@67) = null
     packageFragments('kotlin.jvm': FqName@68) = null
     packageFragments('p': FqName@69) = null
     packageFragments('p.B': FqName@70) = null
-    packageFragments('p.C': FqName@24) = null
+    packageFragments('p.C': FqName@44) = null
     packageFragments('p.T': FqName@71) = null
 }
 
-LazyJavaPackageFragment@28['<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
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@47['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+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
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@81
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@81
+    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@81
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('p': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('p': Name@80) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
-}
-
-LazyJavaPackageFragment@49['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
-}
-
-LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
-}
-
-LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('lang': Name@96) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('B': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('C': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('p': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('p': Name@78) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@61['java'] {
-    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('lang': Name@100) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
+    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@51['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
+LazyJavaPackageFragment@8['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@10['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@104
+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@34['lang'] {
-    classes('foo': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@106
+LazyJavaPackageFragment@49['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
+    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@98
+}
+
+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 }
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noGenericsInParams.lazy.log
index 29e1b5c80fe..27b849b9d36 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@47) = null
+    packageFragments('p.C': FqName@24) = null
 }
 
 LazyJavaPackageFragmentProvider@64 {
@@ -86,7 +86,7 @@ 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
 }
@@ -94,81 +94,69 @@ LazyJavaPackageFragmentProvider@64 {
 LazyJavaPackageFragment@51['<root>'] {
     classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
     classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@28['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('p': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('p': Name@93) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('B': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('C': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    classes('p': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@96
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('p': Name@91) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
 LazyJavaPackageFragment@33['java'] {
-    classes('lang': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('lang': Name@101) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
+    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'] {
-    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@104
-    functions('lang': Name@105) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@104
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
+    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'] {
-    classes('lang': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('lang': Name@109) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@108
+    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'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('lang': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('lang': Name@112) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
 }
 
-LazyJavaPackageFragment@35['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
+ResolutionTaskHolder@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@117
+ResolutionTaskHolder@118 {
+    <name not found> = ArrayList@119[1] { ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[1] { ResolutionCandidate@120 }
 }
 
-LazyJavaPackageFragment@56['lang'] {
-    classes('foo': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@91 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@89) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
index e2771ecbe93..6fad33d99cb 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/noParams.lazy.log
@@ -49,7 +49,7 @@ LazyJavaPackageFragmentProvider@34 {
     packageFragments('kotlin.jvm': FqName@45) = null
     packageFragments('p': FqName@46) = null
     packageFragments('p.B': FqName@47) = null
-    packageFragments('p.C': FqName@18) = null
+    packageFragments('p.C': FqName@33) = null
 }
 
 LazyJavaPackageFragmentProvider@48 {
@@ -64,87 +64,75 @@ LazyJavaPackageFragmentProvider@48 {
     packageFragments('kotlin.jvm': FqName@59) = null
     packageFragments('p': FqName@60) = null
     packageFragments('p.B': FqName@61) = null
-    packageFragments('p.C': FqName@33) = null
-}
-
-LazyJavaPackageFragment@35['<root>'] {
-    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('getParent': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('getParent': Name@65) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('p': Name@69) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@63
+    packageFragments('p.C': FqName@18) = null
 }
 
 LazyJavaPackageFragment@20['<root>'] {
-    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('getParent': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('getParent': Name@65) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('p': Name@69) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('p': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@63
+}
+
+LazyJavaPackageFragment@35['<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
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('p': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('getParent': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('getParent': Name@65) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('p': Name@69) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@73
-}
-
-LazyJavaPackageFragment@38['java'] {
-    classes('lang': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('lang': Name@77) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
-}
-
-LazyJavaPackageFragment@52['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
-}
-
-LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('B': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('C': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('p': Name@67) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@88
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@88
-    functions('lang': Name@89) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@88
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@88
+    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@25['lang'] {
-    classes('getParent': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('getParent': Name@65) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@91
+LazyJavaPackageFragment@23['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@8['lang'] {
-    classes('getParent': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@93
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@93
-    functions('getParent': Name@65) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@93
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@93
+LazyJavaPackageFragment@38['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@40['lang'] {
-    classes('getParent': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('getParent': Name@65) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+LazyJavaPackageFragment@52['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
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
+}
+
+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[3] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[3] { ResolutionCandidate@100, ResolutionCandidate@101, ResolutionCandidate@102 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
index d6561caef0e..d9b51d21149 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/sameGenericsInParams.lazy.log
@@ -136,154 +136,143 @@ LazyJavaPackageFragmentProvider@96 {
 
 LazyJavaPackageFragmentProvider@126 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@127['<root>']
-    packageFragments('B': FqName@37) = null
-    packageFragments('G1': FqName@38) = null
-    packageFragments('G2': FqName@39) = null
-    packageFragments('Int': FqName@40) = null
-    packageFragments('String': FqName@41) = null
+    packageFragments('B': FqName@98) = null
+    packageFragments('G1': FqName@99) = null
+    packageFragments('G2': FqName@100) = null
+    packageFragments('Int': FqName@101) = null
+    packageFragments('String': FqName@102) = null
     packageFragments('java': FqName@128) = LazyJavaPackageFragment@129['java']
     packageFragments('java.lang': FqName@130) = LazyJavaPackageFragment@131['lang']
-    packageFragments('java.lang.B': FqName@46) = null
-    packageFragments('java.lang.G1': FqName@47) = null
-    packageFragments('java.lang.G2': FqName@48) = null
-    packageFragments('java.lang.Int': FqName@49) = null
-    packageFragments('java.lang.String': FqName@50) = null
+    packageFragments('java.lang.B': FqName@107) = null
+    packageFragments('java.lang.G1': FqName@108) = null
+    packageFragments('java.lang.G2': FqName@109) = null
+    packageFragments('java.lang.Int': FqName@110) = null
+    packageFragments('java.lang.String': FqName@111) = null
     packageFragments('kotlin': FqName@132) = null
-    packageFragments('kotlin.B': FqName@52) = null
-    packageFragments('kotlin.G1': FqName@53) = null
-    packageFragments('kotlin.G2': FqName@54) = null
-    packageFragments('kotlin.Int': FqName@55) = null
-    packageFragments('kotlin.String': FqName@56) = null
+    packageFragments('kotlin.B': FqName@113) = null
+    packageFragments('kotlin.G1': FqName@114) = null
+    packageFragments('kotlin.G2': FqName@115) = null
+    packageFragments('kotlin.Int': FqName@116) = null
+    packageFragments('kotlin.String': FqName@117) = null
     packageFragments('kotlin.io': FqName@133) = null
     packageFragments('kotlin.jvm': FqName@134) = null
     packageFragments('p': FqName@135) = null
-    packageFragments('p.B': FqName@60) = null
+    packageFragments('p.B': FqName@121) = null
     packageFragments('p.C': FqName@61) = null
     packageFragments('p.G1': FqName@136) = null
     packageFragments('p.G2': FqName@137) = null
-    packageFragments('p.Int': FqName@64) = null
-    packageFragments('p.String': FqName@65) = null
+    packageFragments('p.Int': FqName@124) = null
+    packageFragments('p.String': FqName@125) = null
 }
 
-LazyJavaPackageFragment@67['<root>'] {
+LazyJavaPackageFragment@36['<root>'] {
     classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('p': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('p': Name@149) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@139
+    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@139
+    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@139
 }
 
-LazyJavaPackageFragment@97['<root>'] {
-    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('p': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('p': Name@149) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@151
+LazyJavaPackageFragment@67['<root>'] {
+    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@150
 }
 
 LazyJavaPackageFragment@2['<root>'] {
-    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    classes('p': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@153
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@153
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    functions('p': Name@149) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@153
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@153
+    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@152
 }
 
-LazyJavaPackageFragment@36['<root>'] {
-    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    classes('p': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@155
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    functions('p': Name@149) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@155
-    memberIndex = computeMemberIndex$1@156 // through LazyPackageFragmentScopeForJavaPackage@155
-}
-
-LazyJavaPackageFragment@43['java'] {
-    classes('lang': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@158
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@158
-    functions('lang': Name@159) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@158
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@158
-}
-
-LazyJavaPackageFragment@74['java'] {
-    classes('lang': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('lang': Name@163) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@162
-}
-
-LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@166
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@166
-    functions('lang': Name@167) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@166
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@166
+LazyJavaPackageFragment@97['<root>'] {
+    classes('B': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('C': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('G1': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('G2': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('Int': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('p': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@154
+    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@154
+    functions('p': Name@147) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@154
+    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@154
 }
 
 LazyJavaPackageFragment@129['java'] {
-    classes('lang': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('lang': Name@171) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('lang': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@157
+    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@157
+    functions('lang': Name@158) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@157
+    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@157
+}
+
+LazyJavaPackageFragment@43['java'] {
+    classes('lang': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@161
+    deserializedPackageScope = Empty@146 // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('lang': Name@162) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
 }
 
 LazyJavaPackageFragment@104['java'] {
-    classes('lang': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@174
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@174
-    functions('lang': Name@175) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@174
-    memberIndex = computeMemberIndex$1@176 // through LazyPackageFragmentScopeForJavaPackage@174
+    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@106['lang'] {
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@177
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@177
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@177
-    memberIndex = computeMemberIndex$1@178 // through LazyPackageFragmentScopeForJavaPackage@177
+LazyJavaPackageFragment@74['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@45['lang'] {
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@180 // through LazyPackageFragmentScopeForJavaPackage@179
+LazyJavaPackageFragment@10['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
+    memberIndex = computeMemberIndex$1@175 // through LazyPackageFragmentScopeForJavaPackage@173
 }
 
-LazyJavaPackageFragment@76['lang'] {
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    memberIndex = computeMemberIndex$1@182 // through LazyPackageFragmentScopeForJavaPackage@181
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    classes('foo': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@183
-    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@183
-    functions('foo': Name@145) = EmptyList@148[empty] // through LazyPackageFragmentScopeForJavaPackage@183
-    memberIndex = computeMemberIndex$1@184 // through LazyPackageFragmentScopeForJavaPackage@183
+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[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
+    <name not found> = ArrayList@197[3] { ResolutionCandidate@194, ResolutionCandidate@195, ResolutionCandidate@196 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
index c6271f02db3..201185635de 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/simpleWithInheritance.lazy.log
@@ -39,29 +39,29 @@ LazyJavaPackageFragmentProvider@23 {
     packageFragments('p': FqName@35) = null
     packageFragments('p.B': FqName@36) = null
     packageFragments('p.C': FqName@37) = null
-    packageFragments('p.D': FqName@22) = null
+    packageFragments('p.D': FqName@38) = null
 }
 
-LazyJavaPackageFragmentProvider@38 {
-    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@39['<root>']
-    packageFragments('B': FqName@40) = null
+LazyJavaPackageFragmentProvider@39 {
+    packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@40['<root>']
+    packageFragments('B': FqName@41) = null
     packageFragments('C': FqName@4) = null
     packageFragments('D': FqName@5) = null
-    packageFragments('java': FqName@41) = LazyJavaPackageFragment@42['java']
-    packageFragments('java.lang': FqName@43) = LazyJavaPackageFragment@44['lang']
-    packageFragments('java.lang.B': FqName@45) = null
+    packageFragments('java': FqName@42) = LazyJavaPackageFragment@43['java']
+    packageFragments('java.lang': FqName@44) = LazyJavaPackageFragment@45['lang']
+    packageFragments('java.lang.B': FqName@46) = null
     packageFragments('java.lang.C': FqName@11) = null
     packageFragments('java.lang.D': FqName@12) = null
-    packageFragments('kotlin': FqName@46) = null
-    packageFragments('kotlin.B': FqName@47) = null
+    packageFragments('kotlin': FqName@47) = null
+    packageFragments('kotlin.B': FqName@48) = null
     packageFragments('kotlin.C': FqName@15) = null
     packageFragments('kotlin.D': FqName@16) = null
-    packageFragments('kotlin.io': FqName@48) = null
-    packageFragments('kotlin.jvm': FqName@49) = null
-    packageFragments('p': FqName@50) = null
-    packageFragments('p.B': FqName@51) = null
+    packageFragments('kotlin.io': FqName@49) = null
+    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@52) = null
+    packageFragments('p.D': FqName@22) = null
 }
 
 LazyJavaPackageFragmentProvider@53 {
@@ -83,83 +83,76 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
     classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
     classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('getParent': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('getParent': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@68
+}
+
+LazyJavaPackageFragment@40['<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
+    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('getParent': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('getParent': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@39['<root>'] {
-    classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('getParent': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('getParent': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@83) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('B': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('C': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('D': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@91) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
+    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@42['java'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
+LazyJavaPackageFragment@43['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@9['lang'] {
-    classes('getParent': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('getParent': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
+LazyJavaPackageFragment@7['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@29['lang'] {
-    classes('getParent': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('getParent': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
+LazyJavaPackageFragment@27['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
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@44['lang'] {
-    classes('getParent': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('getParent': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@101
+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[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
+    <name not found> = ArrayList@113[4] { ResolutionCandidate@110, ResolutionCandidate@111, ResolutionCandidate@112, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
index fc2949044a6..211a8695a25 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateMethod/substitutedGenericInParams.lazy.log
@@ -44,123 +44,111 @@ LazyJavaPackageFragmentProvider@23 {
 
 LazyJavaPackageFragmentProvider@42 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@43['<root>']
-    packageFragments('B': FqName@25) = null
+    packageFragments('B': FqName@3) = null
     packageFragments('C': FqName@4) = null
     packageFragments('java': FqName@44) = LazyJavaPackageFragment@45['java']
     packageFragments('java.lang': FqName@46) = LazyJavaPackageFragment@47['lang']
-    packageFragments('java.lang.B': FqName@31) = null
+    packageFragments('java.lang.B': FqName@10) = null
     packageFragments('java.lang.C': FqName@11) = null
     packageFragments('kotlin': FqName@48) = null
-    packageFragments('kotlin.B': FqName@34) = null
+    packageFragments('kotlin.B': FqName@14) = null
     packageFragments('kotlin.C': FqName@15) = null
     packageFragments('kotlin.io': FqName@49) = null
     packageFragments('kotlin.jvm': FqName@50) = null
     packageFragments('p': FqName@51) = null
     packageFragments('p.B': FqName@52) = null
-    packageFragments('p.C': FqName@40) = null
+    packageFragments('p.C': FqName@21) = null
 }
 
 LazyJavaPackageFragmentProvider@53 {
     packageFragments('<root>': FqName@1) = LazyJavaPackageFragment@54['<root>']
-    packageFragments('B': FqName@3) = null
-    packageFragments('String': FqName@5) = null
+    packageFragments('B': FqName@25) = null
+    packageFragments('String': FqName@26) = null
     packageFragments('T': FqName@55) = null
     packageFragments('java': FqName@56) = LazyJavaPackageFragment@57['java']
     packageFragments('java.lang': FqName@58) = LazyJavaPackageFragment@59['lang']
-    packageFragments('java.lang.B': FqName@10) = null
-    packageFragments('java.lang.String': FqName@12) = null
+    packageFragments('java.lang.B': FqName@31) = null
+    packageFragments('java.lang.String': FqName@32) = null
     packageFragments('java.lang.T': FqName@60) = null
     packageFragments('kotlin': FqName@61) = null
-    packageFragments('kotlin.B': FqName@14) = null
-    packageFragments('kotlin.String': FqName@16) = null
+    packageFragments('kotlin.B': FqName@34) = null
+    packageFragments('kotlin.String': FqName@35) = null
     packageFragments('kotlin.T': FqName@62) = null
     packageFragments('kotlin.io': FqName@63) = null
     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.String': FqName@22) = null
+    packageFragments('p.C': FqName@40) = null
+    packageFragments('p.String': FqName@41) = null
     packageFragments('p.T': FqName@67) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@24['<root>'] {
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
     classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('foo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('foo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@69
+}
+
+LazyJavaPackageFragment@2['<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
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@43['<root>'] {
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('foo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('foo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
-}
-
-LazyJavaPackageFragment@24['<root>'] {
-    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('foo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('foo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@79
-}
-
-LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('lang': Name@83) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
-}
-
-LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('lang': Name@87) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('C': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('p': Name@73) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
 LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('lang': Name@91) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
+    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'] {
+    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'] {
+    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'] {
-    classes('lang': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('lang': Name@95) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('lang': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@93
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@93
+    functions('lang': Name@94) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@93
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@93
 }
 
-LazyJavaPackageFragment@47['lang'] {
-    classes('foo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
+ResolutionTaskHolder@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@98 }
 }
 
-LazyJavaPackageFragment@30['lang'] {
-    classes('foo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@99
-    functions('foo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
+ResolutionTaskHolder@100 {
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@102 }
+    <name not found> = ArrayList@103[1] { ResolutionCandidate@102 }
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('foo': Name@71) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
index 3b2c4d1bbd3..e899846e6f6 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/differentSuperTraits.lazy.log
@@ -76,7 +76,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
-LazyJavaPackageFragment@29['<root>'] {
+LazyJavaPackageFragment@45['<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@29['<root>'] {
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
-LazyJavaPackageFragment@45['<root>'] {
+LazyJavaPackageFragment@29['<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
@@ -94,14 +94,14 @@ LazyJavaPackageFragment@45['<root>'] {
     memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@47['java'] {
     classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
     deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@67
     functions('lang': Name@68) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
-LazyJavaPackageFragment@47['java'] {
+LazyJavaPackageFragment@32['java'] {
     classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
     deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@71
     functions('lang': Name@72) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@71
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
index 8d410b72604..8782956d98f 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTrait.lazy.log
@@ -59,11 +59,11 @@ LazyJavaPackageFragmentProvider@40 {
     packageFragments('kotlin.io': FqName@47) = null
     packageFragments('kotlin.jvm': FqName@48) = null
     packageFragments('p': FqName@49) = null
-    packageFragments('p.A': FqName@21) = null
-    packageFragments('p.B': FqName@38) = null
+    packageFragments('p.A': FqName@37) = null
+    packageFragments('p.B': FqName@22) = null
 }
 
-LazyJavaPackageFragment@25['<root>'] {
+LazyJavaPackageFragment@41['<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
@@ -81,7 +81,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@41['<root>'] {
+LazyJavaPackageFragment@25['<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
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
index 264f3225b17..bdd996cd083 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitDifferentBounds.lazy.log
@@ -53,9 +53,9 @@ LazyJavaPackageFragmentProvider@32 {
     packageFragments('kotlin.io': FqName@48) = null
     packageFragments('kotlin.jvm': FqName@49) = null
     packageFragments('p': FqName@50) = null
-    packageFragments('p.A': FqName@27) = null
-    packageFragments('p.Array': FqName@51) = null
-    packageFragments('p.B': FqName@52) = null
+    packageFragments('p.A': FqName@51) = null
+    packageFragments('p.Array': FqName@52) = null
+    packageFragments('p.B': FqName@29) = null
     packageFragments('p.Base': FqName@53) = null
     packageFragments('p.T': FqName@54) = null
 }
@@ -84,14 +84,14 @@ LazyJavaPackageFragmentProvider@55 {
     packageFragments('kotlin.io': FqName@71) = null
     packageFragments('kotlin.jvm': FqName@72) = null
     packageFragments('p': FqName@73) = null
-    packageFragments('p.A': FqName@74) = null
-    packageFragments('p.Array': FqName@75) = null
-    packageFragments('p.B': FqName@29) = null
+    packageFragments('p.A': FqName@27) = null
+    packageFragments('p.Array': FqName@74) = null
+    packageFragments('p.B': FqName@75) = null
     packageFragments('p.Base': FqName@76) = null
     packageFragments('p.T': FqName@77) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@56['<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@2['<root>'] {
     memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@56['<root>'] {
+LazyJavaPackageFragment@33['<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
@@ -113,7 +113,7 @@ LazyJavaPackageFragment@56['<root>'] {
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@88
 }
 
-LazyJavaPackageFragment@33['<root>'] {
+LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('Array': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
     classes('B': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
diff --git a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
index 84f1c077166..5a758da9a15 100644
--- a/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/duplicateSuper/sameSuperTraitGenerics.lazy.log
@@ -83,7 +83,7 @@ LazyJavaPackageFragmentProvider@56 {
     packageFragments('p.String': FqName@54) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
+LazyJavaPackageFragment@57['<root>'] {
     classes('A': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('B': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('String': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
@@ -93,7 +93,7 @@ LazyJavaPackageFragment@2['<root>'] {
     memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
-LazyJavaPackageFragment@57['<root>'] {
+LazyJavaPackageFragment@33['<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@57['<root>'] {
     memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-LazyJavaPackageFragment@33['<root>'] {
+LazyJavaPackageFragment@2['<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 00823cd2bc4..b422aaa2120 100644
--- a/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/internal.lazy.log
@@ -31,7 +31,7 @@ LazyJavaPackageFragmentProvider@17 {
     packageFragments('p': FqName@26) = null
 }
 
-LazyJavaPackageFragment@18['<root>'] {
+LazyJavaPackageFragment@4['<root>'] {
     classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
@@ -45,7 +45,7 @@ LazyJavaPackageFragment@18['<root>'] {
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
-LazyJavaPackageFragment@4['<root>'] {
+LazyJavaPackageFragment@18['<root>'] {
     classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('a': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
@@ -59,14 +59,14 @@ LazyJavaPackageFragment@4['<root>'] {
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
-LazyJavaPackageFragment@20['java'] {
+LazyJavaPackageFragment@6['java'] {
     classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@41
     functions('lang': Name@42) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@41
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
-LazyJavaPackageFragment@6['java'] {
+LazyJavaPackageFragment@20['java'] {
     classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@45
     functions('lang': Name@46) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@45
@@ -96,3 +96,174 @@ LazyJavaPackageFragment@22['lang'] {
     functions('a': Name@35) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@51
 }
+
+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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@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@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]
+    <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]
+    <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]
+    <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@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@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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
index f8eccea1bcf..8564200f802 100644
--- a/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
+++ b/compiler/testData/diagnostics/tests/multimodule/packagePrivate.lazy.log
@@ -48,12 +48,32 @@ LazyJavaPackageFragment@23['java'] {
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
-LazyJavaPackageFragment@12['lang'] {
+LazyJavaPackageFragment@25['lang'] {
     classes('a': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
-LazyJavaPackageFragment@25['lang'] {
+LazyJavaPackageFragment@12['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]
+    <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@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]
+}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
index 5034f1d25a5..2b0e0e90f90 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/allowForJavaAnnotation.lazy.log
@@ -44,3 +44,8 @@ LazyJavaPackageFragment@23['java'] {
     functions('lang': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
 }
+
+ResolutionTaskHolder@40 {
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@42 }
+    <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 4ef61b7318e..592e220f40d 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaConstructor.lazy.log
@@ -58,3 +58,12 @@ LazyJavaPackageFragment@22['lang'] {
     functions('A': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
index 4bcca39cbbc..69b60c0e525 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForJavaMethods.lazy.log
@@ -27,90 +27,193 @@ LazyJavaClassDescriptor@2['JavaSuperClass'] {
     nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@7
     nestedClasses('foo': Name@33) = null // through LazyJavaClassMemberScope@7
     nestedClasses('multipleParameters': Name@34) = null // through LazyJavaClassMemberScope@7
-    properties('foo': Name@33) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    properties('multipleParameters': Name@34) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@36['JavaSuperClass']
+    properties('foo': Name@35) = EmptyList@13[empty] // through LazyJavaClassMemberScope@7
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@37['JavaSuperClass']
 }
 
-LazyJavaClassTypeConstructor@36['JavaSuperClass'] {
-    parameters = ArrayList@37[empty]
-    supertypes = ArrayList@38[1] { JetTypeImpl@39['Any'] }
+LazyJavaClassTypeConstructor@37['JavaSuperClass'] {
+    parameters = ArrayList@38[empty]
+    supertypes = ArrayList@39[1] { JetTypeImpl@40['Any'] }
 }
 
-LazyJavaClassifierType@40['Object'] {
-    classifier = JavaClassImpl@41['Object']
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@41['Object'] {
+    classifier = JavaClassImpl@42['Object']
+    typeConstructor = DeserializedClassTypeConstructor@43
 }
 
-LazyJavaClassifierType@43['String'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'false': Boolean@46
-    typeConstructor = DeserializedClassTypeConstructor@47
+LazyJavaClassifierType@44['String'] {
+    arguments = ArrayList@45[empty]
+    classifier = JavaClassImpl@46['String']
+    nullable = 'false': Boolean@47
+    typeConstructor = DeserializedClassTypeConstructor@48
 }
 
-LazyJavaClassifierType@48['String'] {
-    arguments = ArrayList@49[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'true': Boolean@50
-    typeConstructor = DeserializedClassTypeConstructor@47
+LazyJavaClassifierType@49['String'] {
+    arguments = ArrayList@50[empty]
+    classifier = JavaClassImpl@46['String']
+    nullable = 'true': Boolean@51
+    typeConstructor = DeserializedClassTypeConstructor@48
 }
 
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('Int': FqName@54) = null
-    packageFragments('JavaSuperClass': FqName@55) = null
-    packageFragments('KotlinSubClass': FqName@56) = null
-    packageFragments('KotlinSubSubClass': FqName@57) = null
-    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
-    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
-    packageFragments('java.lang.Int': FqName@62) = null
-    packageFragments('java.lang.JavaSuperClass': FqName@63) = null
-    packageFragments('java.lang.KotlinSubClass': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.JavaSuperClass': FqName@67) = null
-    packageFragments('kotlin.KotlinSubClass': FqName@68) = null
-    packageFragments('kotlin.io': FqName@69) = null
-    packageFragments('kotlin.jvm': FqName@70) = null
-    topLevelClasses(JavaClassImpl@71['JavaSuperClass']) = LazyJavaClassDescriptor@2['JavaSuperClass']
+LazyJavaPackageFragmentProvider@52 {
+    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
+    packageFragments('Int': FqName@55) = null
+    packageFragments('JavaSuperClass': FqName@56) = null
+    packageFragments('KotlinSubClass': FqName@57) = null
+    packageFragments('KotlinSubSubClass': FqName@58) = null
+    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
+    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
+    packageFragments('java.lang.Int': FqName@63) = null
+    packageFragments('java.lang.JavaSuperClass': FqName@64) = null
+    packageFragments('java.lang.KotlinSubClass': FqName@65) = null
+    packageFragments('kotlin': FqName@66) = null
+    packageFragments('kotlin.Int': FqName@67) = null
+    packageFragments('kotlin.JavaSuperClass': FqName@68) = null
+    packageFragments('kotlin.KotlinSubClass': FqName@69) = null
+    packageFragments('kotlin.io': FqName@70) = null
+    packageFragments('kotlin.jvm': FqName@71) = null
+    topLevelClasses(JavaClassImpl@72['JavaSuperClass']) = LazyJavaClassDescriptor@2['JavaSuperClass']
 }
 
-LazyJavaPackageFragment@53['<root>'] {
-    classes('Int': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('JavaSuperClass': Name@74) = LazyJavaClassDescriptor@2['JavaSuperClass'] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('KotlinSubClass': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('KotlinSubSubClass': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('multipleParameters': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('JavaSuperClass': Name@78) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('KotlinSubClass': Name@75) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('KotlinSubSubClass': Name@76) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@33) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('multipleParameters': Name@34) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@73
+LazyJavaPackageFragment@54['<root>'] {
+    classes('Int': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('JavaSuperClass': Name@75) = LazyJavaClassDescriptor@2['JavaSuperClass'] // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('KotlinSubClass': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('KotlinSubSubClass': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('JavaSuperClass': Name@79) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('KotlinSubClass': Name@76) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('KotlinSubSubClass': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('foo': Name@35) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
-LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('lang': Name@82) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+LazyJavaPackageFragment@60['java'] {
+    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('lang': Name@83) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@61['lang'] {
-    classes('JavaSuperClass': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('KotlinSubClass': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('KotlinSubSubClass': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('multipleParameters': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('JavaSuperClass': Name@78) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('KotlinSubClass': Name@75) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('KotlinSubSubClass': Name@76) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@33) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('multipleParameters': Name@34) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+LazyJavaPackageFragment@62['lang'] {
+    classes('JavaSuperClass': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KotlinSubClass': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KotlinSubSubClass': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('foo': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('JavaSuperClass': Name@79) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('KotlinSubClass': Name@76) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('KotlinSubSubClass': Name@77) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('foo': Name@35) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@85
+}
+
+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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+    <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]
+    <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@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 }
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
 }
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
index 9802bdcade3..a22169a6893 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterConstructor.lazy.log
@@ -99,3 +99,17 @@ LazyJavaPackageFragment@48['test'] {
     functions('J': Name@56) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
index 8db2cb5fc17..33182ae5d79 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/disallowForSamAdapterFunction.lazy.log
@@ -109,3 +109,30 @@ LazyJavaPackageFragment@59['test'] {
     classes('J': Name@68) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@69
     deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@69
 }
+
+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]
+    <name not found> = EmptyList@8[empty]
+    <name not found> = EmptyList@8[empty]
+    <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]
+    <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/namedArguments/namedArgumentsAndDefaultValues.lazy.log b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
index 0cf651a1dc8..ceeb154aecd 100644
--- a/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
+++ b/compiler/testData/diagnostics/tests/namedArguments/namedArgumentsAndDefaultValues.lazy.log
@@ -46,3 +46,272 @@ LazyJavaPackageFragment@8['lang'] {
     functions('zz': Name@27) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <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@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]
+    <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@104 {
+    <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 d16459ada70..542a6e38f04 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/AssertNotNull.lazy.log
@@ -29,25 +29,229 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('plus': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    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
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('plus': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+}
+
+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]
+    <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@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 }
+}
+
+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 }
+}
+
+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[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> = 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[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 }
+}
+
+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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
index a4dee9022d8..7bae8e2bbdd 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/InfixCallNullability.lazy.log
@@ -58,3 +58,731 @@ LazyJavaPackageFragment@10['lang'] {
     functions('times': Name@30) = 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@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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = 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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = 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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 }
+    <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, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 }
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <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]
+    <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@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@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@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@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@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@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 }
+}
+
+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 }
+}
+
+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, ... }
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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@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@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, ... }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
index 3bf3448bb60..3cac6fabbe3 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/NullableNothingIsExactlyNull.lazy.log
@@ -21,25 +21,79 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
     classes('Nothing': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
     classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('plus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('plus': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('equals': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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@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]
+    <name not found> = EmptyList@23[empty]
+}
+
+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@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/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
index b14a595deee..4f003bc46b5 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/PreferExtensionsOnNullableReceiver.lazy.log
@@ -34,3 +34,17 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+}
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@37 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
index c553a12f2d7..3d038b94d49 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/QualifiedExpressionNullability.lazy.log
@@ -38,3 +38,569 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = ArrayList@43[1] { ResolutionCandidate@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]
+    <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 {
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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@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[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 }
+}
+
+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> = 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 }
+}
+
+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 }
+}
+
+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[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[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[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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
index b75bf3c6530..3096f0d8c73 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/ReceiverNullability.lazy.log
@@ -38,3 +38,489 @@ LazyJavaPackageFragment@7['lang'] {
     functions('foo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 }
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@36 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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@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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 {
+    <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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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@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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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@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]
+    <name not found> = EmptyList@18[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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@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]
+    <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 }
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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@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]
+    <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]
+    <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@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@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@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@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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
index 8a307070ae9..9795a3de66a 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/SenselessNullInWhen.lazy.log
@@ -18,3 +18,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 9c8fd39a3c1..c1226be9eef 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/dataFlowInfoAfterExclExcl.lazy.log
@@ -39,3 +39,37 @@ LazyJavaPackageFragment@10['lang'] {
     functions('doString': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
index a161f1a4ba7..cc6d4552a35 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/equalityUnderNotNullCheck.lazy.log
@@ -16,22 +16,26 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
index 0a3bc61820b..9347840df20 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideAmbiguity.lazy.log
@@ -30,10 +30,61 @@ LazyJavaPackageFragment@11['java'] {
 LazyJavaPackageFragment@13['lang'] {
     classes('doSmth1': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
     functions('doSmth1': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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@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@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]
+    <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@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@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]
+    <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 42046901a7e..1f9071a33c4 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/funcLiteralArgsInsideUnresolvedFunction.lazy.log
@@ -30,10 +30,68 @@ LazyJavaPackageFragment@11['java'] {
 LazyJavaPackageFragment@13['lang'] {
     classes('doSmth': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
     functions('doSmth': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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]
+    <name not found> = EmptyList@25[empty]
+}
+
+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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 9ae2e6a323d..90c43f6948f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1270.lazy.log
@@ -6,38 +6,35 @@ LazyJavaClassDescriptor@2['AbstractMap'] {
     defaultType = JetTypeImpl@3['AbstractMap<2>']
     functions('get': Name@4) = ArrayList@5[1] { JavaMethodDescriptor@6['get'] } // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('get': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractMap']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
 }
 
-LazyJavaClassDescriptor@13['HashMap'] {
-    constructors = ArrayList@14[4] { JavaConstructorDescriptor@15['<init>'], JavaConstructorDescriptor@16['<init>'], JavaConstructorDescriptor@17['<init>'], ... } // through LazyJavaClassMemberScope@18
-    defaultType = JetTypeImpl@19['HashMap<2>']
-    enumEntryIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@18
+LazyJavaClassDescriptor@11['HashMap'] {
+    constructors = ArrayList@12[4] { JavaConstructorDescriptor@13['<init>'], JavaConstructorDescriptor@14['<init>'], JavaConstructorDescriptor@15['<init>'], ... } // through LazyJavaClassMemberScope@16
+    defaultType = JetTypeImpl@17['HashMap<2>']
+    enumEntryIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@16
     functionTypeForSamInterface = null
-    functions('get': Name@9) = ArrayList@21[1] { JavaMethodDescriptor@22['get'] } // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@18
-    nestedClassIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@18
-    nestedClasses('get': Name@9) = null // through LazyJavaClassMemberScope@18
-    properties('get': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@18
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@26['HashMap']
+    functions('get': Name@19) = ArrayList@20[1] { JavaMethodDescriptor@21['get'] } // through LazyJavaClassMemberScope@16
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@16
+    nestedClassIndex = LinkedHashMap@23 // through LazyJavaClassMemberScope@16
+    nestedClasses('get': Name@19) = null // through LazyJavaClassMemberScope@16
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@25['HashMap']
 }
 
-LazyJavaClassDescriptor@27['Serializable'] {
-    functions('get': Name@4) = EmptyList@10[empty] // through LazyJavaClassMemberScope@28
+LazyJavaClassDescriptor@26['Serializable'] {
+    functions('get': Name@4) = EmptyList@27[empty] // through LazyJavaClassMemberScope@28
     memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@28
-    properties('get': Name@9) = EmptyList@10[empty] // through LazyJavaClassMemberScope@28
     typeConstructor = LazyJavaClassTypeConstructor@30['Serializable']
 }
 
-LazyJavaClassTypeConstructor@12['AbstractMap'] {
+LazyJavaClassTypeConstructor@10['AbstractMap'] {
     parameters = ArrayList@31[2] { LazyJavaTypeParameterDescriptor@32['K'], LazyJavaTypeParameterDescriptor@33['V'] }
     supertypes = ArrayList@34[1] { LazyJavaClassifierType@35['Map<K, V>'] }
 }
 
-LazyJavaClassTypeConstructor@26['HashMap'] {
+LazyJavaClassTypeConstructor@25['HashMap'] {
     parameters = ArrayList@36[2] { LazyJavaTypeParameterDescriptor@37['K'], LazyJavaTypeParameterDescriptor@38['V'] }
     supertypes = ArrayList@39[4] { LazyJavaClassifierType@40['AbstractMap<K, V>'], LazyJavaClassifierType@41['Map<K, V>'], LazyJavaClassifierType@42['Cloneable'], ... }
 }
@@ -51,7 +48,7 @@ LazyJavaClassifierType@40['AbstractMap<K, V>'] {
     arguments = ArrayList@46[2] { TypeProjectionImpl@47, TypeProjectionImpl@48 }
     classifier = JavaClassImpl@49['AbstractMap']
     memberScope = SubstitutingScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractMap']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractMap']
 }
 
 LazyJavaClassifierType@42['Cloneable'] {
@@ -72,63 +69,63 @@ LazyJavaClassifierType@60['K'] {
     arguments = ArrayList@61[empty]
     classifier = JavaTypeParameterImpl@62['K']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
-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@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaClassifierType@67['K'] {
     arguments = ArrayList@68[empty]
     classifier = JavaTypeParameterImpl@69['K']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@70['K'] {
     arguments = ArrayList@71[empty]
     classifier = JavaTypeParameterImpl@72['K']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@73['K'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@72['K']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-}
-
-LazyJavaClassifierType@76['K'] {
-    arguments = ArrayList@77[empty]
     classifier = JavaTypeParameterImpl@57['K']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
+LazyJavaClassifierType@76['K'] {
+    arguments = ArrayList@77[empty]
+    classifier = JavaTypeParameterImpl@65['K']
+    nullable = 'true': Boolean@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
+}
+
 LazyJavaClassifierType@78['K'] {
     arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@69['K']
+    classifier = JavaTypeParameterImpl@72['K']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@80['K'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@62['K']
+    classifier = JavaTypeParameterImpl@69['K']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@82['K'] {
     arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@84['Map<? extends K, ? extends V>'] {
@@ -147,14 +144,14 @@ LazyJavaClassifierType@91['Map<? extends K, ? extends V>'] {
     typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@35['Map<K, V>'] {
+LazyJavaClassifierType@41['Map<K, V>'] {
     arguments = ArrayList@97[2] { TypeProjectionImpl@98, TypeProjectionImpl@99 }
     classifier = JavaClassImpl@100['Map']
     memberScope = SubstitutingScope@101
     typeConstructor = DeserializedClassTypeConstructor@90
 }
 
-LazyJavaClassifierType@41['Map<K, V>'] {
+LazyJavaClassifierType@35['Map<K, V>'] {
     arguments = ArrayList@102[2] { TypeProjectionImpl@103, TypeProjectionImpl@104 }
     classifier = JavaClassImpl@105['Map']
     memberScope = SubstitutingScope@106
@@ -179,7 +176,7 @@ LazyJavaClassifierType@112['Object'] {
 
 LazyJavaClassifierType@115['Object'] {
     arguments = ArrayList@116[empty]
-    classifier = JavaClassImpl@109['Object']
+    classifier = JavaClassImpl@114['Object']
     memberScope = DeserializedClassMemberScope@110
     nullable = 'true': Boolean@75
     typeConstructor = DeserializedClassTypeConstructor@111
@@ -187,7 +184,7 @@ LazyJavaClassifierType@115['Object'] {
 
 LazyJavaClassifierType@117['Object'] {
     arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@114['Object']
+    classifier = JavaClassImpl@109['Object']
     memberScope = DeserializedClassMemberScope@110
     nullable = 'true': Boolean@75
     typeConstructor = DeserializedClassTypeConstructor@111
@@ -228,7 +225,7 @@ LazyJavaClassifierType@134['V'] {
     arguments = ArrayList@135[empty]
     classifier = JavaTypeParameterImpl@136['V']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
 }
 
 LazyJavaClassifierType@137['V'] {
@@ -249,61 +246,61 @@ LazyJavaClassifierType@143['V'] {
     arguments = ArrayList@144[empty]
     classifier = JavaTypeParameterImpl@145['V']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
 }
 
 LazyJavaClassifierType@146['V'] {
     arguments = ArrayList@147[empty]
     classifier = JavaTypeParameterImpl@148['V']
     nullable = 'false': Boolean@58
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
 }
 
 LazyJavaClassifierType@149['V'] {
     arguments = ArrayList@150[empty]
-    classifier = JavaTypeParameterImpl@148['V']
+    classifier = JavaTypeParameterImpl@136['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
 }
 
 LazyJavaClassifierType@151['V'] {
     arguments = ArrayList@152[empty]
-    classifier = JavaTypeParameterImpl@139['V']
+    classifier = JavaTypeParameterImpl@142['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
 }
 
 LazyJavaClassifierType@153['V'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@136['V']
+    classifier = JavaTypeParameterImpl@132['V']
     nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
 }
 
 LazyJavaClassifierType@155['V'] {
     arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@145['V']
+    classifier = JavaTypeParameterImpl@139['V']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
 LazyJavaClassifierType@157['V'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaTypeParameterImpl@142['V']
-    nullable = 'true': Boolean@75
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
-}
-
-LazyJavaClassifierType@159['V'] {
-    arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@128['V']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
 }
 
+LazyJavaClassifierType@159['V'] {
+    arguments = ArrayList@160[empty]
+    classifier = JavaTypeParameterImpl@148['V']
+    nullable = 'true': Boolean@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+}
+
 LazyJavaClassifierType@161['V'] {
     arguments = ArrayList@162[empty]
-    classifier = JavaTypeParameterImpl@132['V']
+    classifier = JavaTypeParameterImpl@145['V']
     nullable = 'true': Boolean@75
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
 }
@@ -332,70 +329,117 @@ LazyJavaPackageFragmentProvider@163 {
     packageFragments('kt1270.String': FqName@189) = null
     packageFragments('kt1270.java': FqName@190) = null
     topLevelClasses(JavaClassImpl@49['AbstractMap']) = LazyJavaClassDescriptor@2['AbstractMap']
-    topLevelClasses(JavaClassImpl@191['HashMap']) = LazyJavaClassDescriptor@13['HashMap']
-    topLevelClasses(JavaClassImpl@125['Serializable']) = LazyJavaClassDescriptor@27['Serializable']
+    topLevelClasses(JavaClassImpl@191['HashMap']) = LazyJavaClassDescriptor@11['HashMap']
+    topLevelClasses(JavaClassImpl@125['Serializable']) = LazyJavaClassDescriptor@26['Serializable']
 }
 
 LazyJavaPackageFragment@170['java'] {
     classes('lang': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
     classes('util': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@193
     deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@193
-    functions('lang': Name@196) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('lang': Name@196) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@193
     memberIndex = computeMemberIndex$1@197 // through LazyPackageFragmentScopeForJavaPackage@193
 }
 
 LazyJavaPackageFragment@174['lang'] {
-    classes('get': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    classes('java': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@198
-    deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@198
-    functions('get': Name@9) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@198
-    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('java': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@199
 }
 
 LazyJavaPackageFragment@179['util'] {
-    classes('HashMap': Name@201) = LazyJavaClassDescriptor@13['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('HashMap': Name@201) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('HashMap': Name@200) = LazyJavaClassDescriptor@11['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@201
+    deserializedPackageScope = Empty@195 // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('HashMap': Name@200) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@201
 }
 
 LazyJavaTypeParameterDescriptor@37['K'] {
-    defaultType = JetTypeImpl@204['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@63
-    upperBounds = LinkedHashSet@205[1] { NullableType@206 }
+    defaultType = JetTypeImpl@203['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    upperBounds = LinkedHashSet@204[1] { NullableType@205 }
 }
 
 LazyJavaTypeParameterDescriptor@32['K'] {
-    defaultType = JetTypeImpl@207['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+    defaultType = JetTypeImpl@206['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@66
 }
 
 LazyJavaTypeParameterDescriptor@38['V'] {
-    defaultType = JetTypeImpl@208['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
-    upperBounds = LinkedHashSet@209[1] { NullableType@210 }
+    defaultType = JetTypeImpl@207['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
+    upperBounds = LinkedHashSet@208[1] { NullableType@209 }
 }
 
 LazyJavaTypeParameterDescriptor@33['V'] {
-    defaultType = JetTypeImpl@211['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@133
-    upperBounds = LinkedHashSet@212[1] { NullableType@213 }
+    defaultType = JetTypeImpl@210['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    upperBounds = LinkedHashSet@211[1] { NullableType@212 }
 }
 
-LazyJavaTypeParameterResolver@214 {
-    resolve(JavaTypeParameterImpl@215['K']) = LazyJavaTypeParameterDescriptor@32['K']
-    resolve(JavaTypeParameterImpl@216['V']) = LazyJavaTypeParameterDescriptor@33['V']
+LazyJavaTypeParameterResolver@213 {
+    resolve(JavaTypeParameterImpl@214['K']) = LazyJavaTypeParameterDescriptor@32['K']
+    resolve(JavaTypeParameterImpl@215['V']) = LazyJavaTypeParameterDescriptor@33['V']
 }
 
-LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@218['K']) = LazyJavaTypeParameterDescriptor@37['K']
-    resolve(JavaTypeParameterImpl@219['V']) = LazyJavaTypeParameterDescriptor@38['V']
+LazyJavaTypeParameterResolver@216 {
+    resolve(JavaTypeParameterImpl@217['K']) = LazyJavaTypeParameterDescriptor@37['K']
+    resolve(JavaTypeParameterImpl@218['V']) = LazyJavaTypeParameterDescriptor@38['V']
+}
+
+LazyJavaTypeParameterResolver@219 {
+    resolve(JavaTypeParameterImpl@139['V']) = null
 }
 
 LazyJavaTypeParameterResolver@220 {
     resolve(JavaTypeParameterImpl@145['V']) = null
 }
 
-LazyJavaTypeParameterResolver@221 {
-    resolve(JavaTypeParameterImpl@132['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@229 {
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@240 {
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 07245404db9..24b3d7a20b9 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1680.lazy.log
@@ -30,3 +30,79 @@ LazyJavaPackageFragment@10['lang'] {
     functions('equals': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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> = EmptyList@22[empty]
+}
+
+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@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]
+    <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@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 }
+}
+
+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 }
+}
+
+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/nullabilityAndSmartCasts/kt1778.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
index 595cd2acda1..9885ff966ae 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt1778.lazy.log
@@ -9,62 +9,193 @@ LazyJavaClassDescriptor@1['CharSequence'] {
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@4
     nestedClassIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@4
     nestedClasses('length': Name@5) = null // through LazyJavaClassMemberScope@4
-    properties('length': Name@5) = EmptyList@10[empty] // through LazyJavaClassMemberScope@4
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['CharSequence']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@11['CharSequence']
 }
 
-LazyJavaClassTypeConstructor@12['CharSequence'] {
-    parameters = ArrayList@13[empty]
-    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
+LazyJavaClassTypeConstructor@11['CharSequence'] {
+    parameters = ArrayList@12[empty]
+    supertypes = ArrayList@13[1] { JetTypeImpl@14['Any'] }
 }
 
-LazyJavaClassifierType@16['Object'] {
-    classifier = JavaClassImpl@17['Object']
-    typeConstructor = DeserializedClassTypeConstructor@18
+LazyJavaClassifierType@15['Object'] {
+    classifier = JavaClassImpl@16['Object']
+    typeConstructor = DeserializedClassTypeConstructor@17
 }
 
-LazyJavaPackageFragmentProvider@19 {
-    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
-    packageFragments('Any': FqName@22) = null
-    packageFragments('Array': FqName@23) = null
-    packageFragments('String': FqName@24) = null
-    packageFragments('java': FqName@25) = LazyJavaPackageFragment@26['java']
-    packageFragments('java.lang': FqName@27) = LazyJavaPackageFragment@28['lang']
-    packageFragments('java.lang.Any': FqName@29) = null
-    packageFragments('java.lang.Array': FqName@30) = null
-    packageFragments('java.lang.CharSequence': FqName@31) = null
-    packageFragments('java.lang.String': FqName@32) = null
-    packageFragments('kotlin': FqName@33) = null
-    packageFragments('kotlin.Any': FqName@34) = null
-    packageFragments('kotlin.Array': FqName@35) = null
-    packageFragments('kotlin.String': FqName@36) = null
-    packageFragments('kotlin.io': FqName@37) = null
-    packageFragments('kotlin.jvm': FqName@38) = null
-    packageFragments('kt1778': FqName@39) = null
-    packageFragments('kt1778.Any': FqName@40) = null
-    packageFragments('kt1778.Array': FqName@41) = null
-    packageFragments('kt1778.String': FqName@42) = null
-    packageFragments('kt1778.java': FqName@43) = null
-    topLevelClasses(JavaClassImpl@44['CharSequence']) = LazyJavaClassDescriptor@1['CharSequence']
+LazyJavaPackageFragmentProvider@18 {
+    packageFragments('<root>': FqName@19) = LazyJavaPackageFragment@20['<root>']
+    packageFragments('Any': FqName@21) = null
+    packageFragments('Array': FqName@22) = null
+    packageFragments('String': FqName@23) = null
+    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
+    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
+    packageFragments('java.lang.Any': FqName@28) = null
+    packageFragments('java.lang.Array': FqName@29) = null
+    packageFragments('java.lang.CharSequence': FqName@30) = null
+    packageFragments('java.lang.String': FqName@31) = null
+    packageFragments('kotlin': FqName@32) = null
+    packageFragments('kotlin.Any': FqName@33) = null
+    packageFragments('kotlin.Array': FqName@34) = null
+    packageFragments('kotlin.String': FqName@35) = null
+    packageFragments('kotlin.io': FqName@36) = null
+    packageFragments('kotlin.jvm': FqName@37) = null
+    packageFragments('kt1778': FqName@38) = null
+    packageFragments('kt1778.Any': FqName@39) = null
+    packageFragments('kt1778.Array': FqName@40) = null
+    packageFragments('kt1778.String': FqName@41) = null
+    packageFragments('kt1778.java': FqName@42) = null
+    topLevelClasses(JavaClassImpl@43['CharSequence']) = LazyJavaClassDescriptor@1['CharSequence']
 }
 
-LazyJavaPackageFragment@26['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@48) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@46
+LazyJavaPackageFragment@25['java'] {
+    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@28['lang'] {
+LazyJavaPackageFragment@27['lang'] {
     classes('CharSequence': Name@50) = LazyJavaClassDescriptor@1['CharSequence'] // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('equals': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('get': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('java': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('length': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('equals': Name@52) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('get': Name@53) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('length': Name@5) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('java': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 }
+}
+
+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> = 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[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[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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
index 0a4e58f4e95..041e63314d2 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2109.lazy.log
@@ -27,3 +27,37 @@ LazyJavaPackageFragment@7['lang'] {
     functions('foo': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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> = 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]
+    <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> = 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@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 09b3f2b7669..959b74d10bf 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2125.lazy.log
@@ -33,3 +33,139 @@ LazyJavaPackageFragment@11['lang'] {
     functions('invoke': Name@26) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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> = 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> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@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]
+    <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]
+    <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 {
+    <name not found> = EmptyList@21[empty]
+    <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 fabce0e54c3..9cf8d2d6946 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2146.lazy.log
@@ -25,3 +25,156 @@ LazyJavaPackageFragment@7['lang'] {
     functions('equals': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+}
+
+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@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@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@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[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 }
+}
+
+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 }
+}
+
+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[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> = 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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
index 262ae8d2929..64f6994596c 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2164.lazy.log
@@ -34,10 +34,362 @@ LazyJavaPackageFragment@9['java'] {
 LazyJavaPackageFragment@11['lang'] {
     classes('equals': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
     classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
     deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
     functions('equals': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     functions('foo': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('plus': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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> = EmptyList@29[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 }
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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@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 }
+}
+
+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> = 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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
index 0dc4ce4ebd4..8452b3f4530 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2176.lazy.log
@@ -22,3 +22,63 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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@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@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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
index da0b442551d..7fae1b14eb2 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2195.lazy.log
@@ -22,10 +22,34 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('errorCallback': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
     functions('equals': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     functions('errorCallback': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('invoke': Name@24) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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]
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
index 21d67b5b993..302c675d373 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2212.lazy.log
@@ -5,46 +5,40 @@ DescriptorResolver@0 {
 LazyJavaClassDescriptor@2['Appendable'] {
     functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
 }
 
-LazyJavaClassDescriptor@9['AutoCloseable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
+LazyJavaClassDescriptor@8['AutoCloseable'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@9
+    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@9
+    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@13['Closeable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+LazyJavaClassDescriptor@12['Closeable'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
-LazyJavaClassDescriptor@17['FilterOutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+LazyJavaClassDescriptor@16['FilterOutputStream'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@21['OutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+LazyJavaClassDescriptor@20['OutputStream'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
-LazyJavaClassDescriptor@25['PrintStream'] {
-    defaultType = JetTypeImpl@26['PrintStream']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
-    functions('println': Name@7) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@28
-    nestedClasses('println': Name@7) = null // through LazyJavaClassMemberScope@28
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@28
+LazyJavaClassDescriptor@24['PrintStream'] {
+    defaultType = JetTypeImpl@25['PrintStream']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
+    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
+    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -60,27 +54,27 @@ LazyJavaClassDescriptor@37['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@47['System']
 }
 
-LazyJavaClassTypeConstructor@8['Appendable'] {
+LazyJavaClassTypeConstructor@7['Appendable'] {
     parameters = ArrayList@48[empty]
     supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
 }
 
-LazyJavaClassTypeConstructor@12['AutoCloseable'] {
+LazyJavaClassTypeConstructor@11['AutoCloseable'] {
     parameters = ArrayList@51[empty]
     supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
 }
 
-LazyJavaClassTypeConstructor@16['Closeable'] {
+LazyJavaClassTypeConstructor@15['Closeable'] {
     parameters = ArrayList@53[empty]
     supertypes = ArrayList@54[1] { LazyJavaClassifierType@55['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
     parameters = ArrayList@56[empty]
     supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@24['OutputStream'] {
+LazyJavaClassTypeConstructor@23['OutputStream'] {
     parameters = ArrayList@59[empty]
     supertypes = ArrayList@60[1] { LazyJavaClassifierType@61['Closeable'] }
 }
@@ -98,35 +92,35 @@ LazyJavaClassifierType@65['Appendable'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['Appendable']
     memberScope = LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
 }
 
 LazyJavaClassifierType@55['AutoCloseable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
-}
-
-LazyJavaClassifierType@61['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+    memberScope = LazyJavaClassMemberScope@9
+    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
 LazyJavaClassifierType@66['Closeable'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaClassImpl@73['Closeable']
+    memberScope = LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
+}
+
+LazyJavaClassifierType@61['Closeable'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+    memberScope = LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
 LazyJavaClassifierType@64['FilterOutputStream'] {
     arguments = ArrayList@76[empty]
     classifier = JavaClassImpl@77['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
 LazyJavaClassifierType@78['Flushable'] {
@@ -171,14 +165,14 @@ LazyJavaClassifierType@94['Object'] {
 LazyJavaClassifierType@58['OutputStream'] {
     arguments = ArrayList@96[empty]
     classifier = JavaClassImpl@97['OutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
 LazyJavaClassifierType@98['PrintStream'] {
     arguments = ArrayList@99[empty]
     classifier = JavaClassImpl@100['PrintStream']
-    memberScope = LazyJavaClassMemberScope@28
+    memberScope = LazyJavaClassMemberScope@27
     nullable = 'false': Boolean@83
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -230,11 +224,11 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kt2212.String': FqName@136) = null
     packageFragments('kt2212.System': FqName@137) = null
     topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@9['AutoCloseable']
-    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@13['Closeable']
-    topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
-    topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@25['PrintStream']
+    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
+    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']
     topLevelClasses(JavaClassImpl@138['System']) = LazyJavaClassDescriptor@37['System']
 }
 
@@ -248,11 +242,66 @@ LazyJavaPackageFragment@117['java'] {
 LazyJavaPackageFragment@121['lang'] {
     classes('System': Name@144) = LazyJavaClassDescriptor@37['System'] // through LazyPackageFragmentScopeForJavaPackage@145
     classes('equals': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('plus': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('println': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@145
     deserializedPackageScope = Empty@141 // through LazyPackageFragmentScopeForJavaPackage@145
     functions('equals': Name@146) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    functions('plus': Name@147) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    functions('println': Name@7) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@145
+    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@145
+}
+
+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@160 {
+    <name not found> = ArrayList@161[1] { ResolutionCandidate@162 }
+    <name not found> = ArrayList@163[1] { ResolutionCandidate@162 }
+    <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@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> = 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/nullabilityAndSmartCasts/kt2216.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
index ca99400af50..375c76ceb18 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2216.lazy.log
@@ -38,3 +38,330 @@ LazyJavaPackageFragment@11['lang'] {
     functions('plus': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+    <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 }
+    <name not found> = EmptyList@23[empty]
+    <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> = 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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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]
+    <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@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@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 }
+}
+
+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 {
+    <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 }
+}
+
+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 }
+}
+
+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> = 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> = 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, ... }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
index 8672eab4b1e..d66d5320d05 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2223.lazy.log
@@ -29,3 +29,27 @@ LazyJavaPackageFragment@9['lang'] {
     functions('equals': Name@23) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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> = EmptyList@21[empty]
+}
+
+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@41 {
+    <name not found> = ArrayList@42[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
index f0c20f751e9..ecf0015bd32 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2234.lazy.log
@@ -53,3 +53,146 @@ LazyJavaPackageFragment@23['lang'] {
     functions('equals': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
     memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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> = EmptyList@43[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 }
+    <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 }
+    <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]
+    <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@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@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[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> = 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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
index b717d6ab77e..736d8b8cf63 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt2336.lazy.log
@@ -27,28 +27,82 @@ LazyJavaPackageFragment@5['<root>'] {
     classes('String': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('not': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('not': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('equals': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('foo': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['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@12['lang'] {
-    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('not': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('equals': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('foo': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('not': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('equals': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('equals': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': 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@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]
+}
+
+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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
index 8b4c36ea9df..1c41bd53157 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt244.lazy.log
@@ -6,46 +6,40 @@ DescriptorResolver@0 {
 LazyJavaClassDescriptor@2['Appendable'] {
     functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
 }
 
-LazyJavaClassDescriptor@9['AutoCloseable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    memberIndex = computeMemberIndex$1@11 // through LazyJavaClassMemberScope@10
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
+LazyJavaClassDescriptor@8['AutoCloseable'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@9
+    memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@9
+    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@13['Closeable'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+LazyJavaClassDescriptor@12['Closeable'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
-LazyJavaClassDescriptor@17['FilterOutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+LazyJavaClassDescriptor@16['FilterOutputStream'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@21['OutputStream'] {
-    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+LazyJavaClassDescriptor@20['OutputStream'] {
+    functions('println': Name@3) = EmptyList@4[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
-LazyJavaClassDescriptor@25['PrintStream'] {
-    defaultType = JetTypeImpl@26['PrintStream']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@28
-    functions('println': Name@7) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@28
-    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@28
-    nestedClasses('println': Name@7) = null // through LazyJavaClassMemberScope@28
-    properties('println': Name@7) = EmptyList@4[empty] // through LazyJavaClassMemberScope@28
+LazyJavaClassDescriptor@24['PrintStream'] {
+    defaultType = JetTypeImpl@25['PrintStream']
+    enumEntryIndex = LinkedHashMap@26 // through LazyJavaClassMemberScope@27
+    functions('println': Name@28) = ArrayList@29[10] { JavaMethodDescriptor@30['println'], JavaMethodDescriptor@31['println'], JavaMethodDescriptor@32['println'], ... } // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@27
+    nestedClassIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@27
+    nestedClasses('println': Name@28) = null // through LazyJavaClassMemberScope@27
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@35['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -61,27 +55,27 @@ LazyJavaClassDescriptor@37['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@47['System']
 }
 
-LazyJavaClassTypeConstructor@8['Appendable'] {
+LazyJavaClassTypeConstructor@7['Appendable'] {
     parameters = ArrayList@48[empty]
     supertypes = ArrayList@49[1] { JetTypeImpl@50['Any'] }
 }
 
-LazyJavaClassTypeConstructor@12['AutoCloseable'] {
+LazyJavaClassTypeConstructor@11['AutoCloseable'] {
     parameters = ArrayList@51[empty]
     supertypes = ArrayList@52[1] { JetTypeImpl@50['Any'] }
 }
 
-LazyJavaClassTypeConstructor@16['Closeable'] {
+LazyJavaClassTypeConstructor@15['Closeable'] {
     parameters = ArrayList@53[empty]
     supertypes = ArrayList@54[1] { LazyJavaClassifierType@55['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@20['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@19['FilterOutputStream'] {
     parameters = ArrayList@56[empty]
     supertypes = ArrayList@57[1] { LazyJavaClassifierType@58['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@24['OutputStream'] {
+LazyJavaClassTypeConstructor@23['OutputStream'] {
     parameters = ArrayList@59[empty]
     supertypes = ArrayList@60[1] { LazyJavaClassifierType@61['Closeable'] }
 }
@@ -99,35 +93,35 @@ LazyJavaClassifierType@65['Appendable'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['Appendable']
     memberScope = LazyJavaClassMemberScope@5
-    typeConstructor = LazyJavaClassTypeConstructor@8['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@7['Appendable']
 }
 
 LazyJavaClassifierType@55['AutoCloseable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@10
-    typeConstructor = LazyJavaClassTypeConstructor@12['AutoCloseable']
-}
-
-LazyJavaClassifierType@66['Closeable'] {
-    arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+    memberScope = LazyJavaClassMemberScope@9
+    typeConstructor = LazyJavaClassTypeConstructor@11['AutoCloseable']
 }
 
 LazyJavaClassifierType@61['Closeable'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaClassImpl@73['Closeable']
+    memberScope = LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
+}
+
+LazyJavaClassifierType@66['Closeable'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@14
-    typeConstructor = LazyJavaClassTypeConstructor@16['Closeable']
+    memberScope = LazyJavaClassMemberScope@13
+    typeConstructor = LazyJavaClassTypeConstructor@15['Closeable']
 }
 
 LazyJavaClassifierType@64['FilterOutputStream'] {
     arguments = ArrayList@76[empty]
     classifier = JavaClassImpl@77['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@18
-    typeConstructor = LazyJavaClassTypeConstructor@20['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@17
+    typeConstructor = LazyJavaClassTypeConstructor@19['FilterOutputStream']
 }
 
 LazyJavaClassifierType@78['Flushable'] {
@@ -172,14 +166,14 @@ LazyJavaClassifierType@94['Object'] {
 LazyJavaClassifierType@58['OutputStream'] {
     arguments = ArrayList@96[empty]
     classifier = JavaClassImpl@97['OutputStream']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@24['OutputStream']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['OutputStream']
 }
 
 LazyJavaClassifierType@98['PrintStream'] {
     arguments = ArrayList@99[empty]
     classifier = JavaClassImpl@100['PrintStream']
-    memberScope = LazyJavaClassMemberScope@28
+    memberScope = LazyJavaClassMemberScope@27
     nullable = 'false': Boolean@83
     typeConstructor = LazyJavaClassTypeConstructor@36['PrintStream']
 }
@@ -228,11 +222,11 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kt244.String': FqName@133) = null
     packageFragments('kt244.System': FqName@134) = null
     topLevelClasses(JavaClassImpl@69['Appendable']) = LazyJavaClassDescriptor@2['Appendable']
-    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@9['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@13['Closeable']
-    topLevelClasses(JavaClassImpl@77['FilterOutputStream']) = LazyJavaClassDescriptor@17['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@97['OutputStream']) = LazyJavaClassDescriptor@21['OutputStream']
-    topLevelClasses(JavaClassImpl@100['PrintStream']) = LazyJavaClassDescriptor@25['PrintStream']
+    topLevelClasses(JavaClassImpl@71['AutoCloseable']) = LazyJavaClassDescriptor@8['AutoCloseable']
+    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']
     topLevelClasses(JavaClassImpl@135['System']) = LazyJavaClassDescriptor@37['System']
 }
 
@@ -247,9 +241,167 @@ LazyJavaPackageFragment@120['lang'] {
     classes('System': Name@141) = LazyJavaClassDescriptor@37['System'] // through LazyPackageFragmentScopeForJavaPackage@142
     classes('equals': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
     classes('i': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('println': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@142
     deserializedPackageScope = Empty@138 // through LazyPackageFragmentScopeForJavaPackage@142
     functions('equals': Name@143) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('println': Name@7) = EmptyList@4[empty] // through LazyPackageFragmentScopeForJavaPackage@142
     memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@142
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@4[empty]
+    <name not found> = EmptyList@4[empty]
+    <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> = 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]
+    <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@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@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[1] { ResolutionCandidate@231 }
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@231 }
+}
+
+ResolutionTaskHolder@233 {
+    <name not found> = ArrayList@234[2] { ResolutionCandidate@235, ResolutionCandidate@236 }
+    <name not found> = ArrayList@237[2] { ResolutionCandidate@235, ResolutionCandidate@236 }
+}
+
+ResolutionTaskHolder@238 {
+    <name not found> = ArrayList@239[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
+    <name not found> = ArrayList@242[2] { ResolutionCandidate@240, ResolutionCandidate@241 }
+}
+
+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 {
+    <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/nullabilityAndSmartCasts/kt362.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
index 34d20080fe5..1a09710f41f 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/kt362.lazy.log
@@ -34,9 +34,252 @@ LazyJavaPackageFragment@15['java'] {
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('plus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('test': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('test': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('plus': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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@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@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@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@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, ... }
+}
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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@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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 }
+    <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]
+    <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@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@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@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 {
+    <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 }
+}
+
+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 }
+}
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <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@176 {
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 f9dd838507c..768655a3702 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noSenselessNullOnNullableType.lazy.log
@@ -97,3 +97,30 @@ LazyJavaPackageFragment@43['java'] {
 LazyJavaPackageFragment@45['lang'] {
     deserializedPackageScope = Empty@65 // through LazyPackageFragmentScopeForJavaPackage@70
 }
+
+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]
+    <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]
+    <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/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
index b2b246c4270..ee11a968843 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/noUnnecessaryNotNullAssertionOnErrorType.lazy.log
@@ -31,3 +31,53 @@ LazyJavaPackageFragment@11['lang'] {
     functions('bar': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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/senslessComparisonWithNullOnTypeParameters.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
index 7640a2c4e2b..863437990c8 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/senslessComparisonWithNullOnTypeParameters.lazy.log
@@ -18,22 +18,91 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+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@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@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> = 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 }
+}
+
+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> = 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> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
index 91a9e6bd958..4519e772e70 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastReceiverWithGenerics.lazy.log
@@ -42,3 +42,36 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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]
+}
+
+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@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@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
index bed6d325ad6..7db6461db1d 100644
--- a/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullabilityAndSmartCasts/smartCastsAndBooleanExpressions.lazy.log
@@ -31,3 +31,75 @@ LazyJavaPackageFragment@7['lang'] {
     functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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> = EmptyList@17[empty]
+}
+
+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@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]
+    <name not found> = EmptyList@17[empty]
+}
+
+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@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[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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
index eb07a475267..553a358e5d4 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullAssertOnTypeWithNullableUpperBound.lazy.log
@@ -15,26 +15,66 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('toString': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('toString': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('toString': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('toString': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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> = 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@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/nullableTypes/nullableArgumentForIn.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
index 8d632ad91b4..fbe9bd34764 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/nullableArgumentForIn.lazy.log
@@ -13,25 +13,64 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
     classes('contains': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('rangeTo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('contains': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('rangeTo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('contains': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('contains': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('rangeTo': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('contains': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('rangeTo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('contains': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('contains': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
index 8f6a771f47e..cdda8195024 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/redundantNullableInSupertype.lazy.log
@@ -16,22 +16,21 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
index eb07a475267..3ee058cd832 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/safeCallOnTypeWithNullableUpperBound.lazy.log
@@ -15,26 +15,56 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('toString': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('toString': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('equals': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('toString': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('toString': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+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@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@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> = 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@56 {
+    <name not found> = ArrayList@57[1] { ResolutionCandidate@58 }
+    <name not found> = ArrayList@59[1] { ResolutionCandidate@58 }
 }
diff --git a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
index 7e6cdad0494..d0f079fd12c 100644
--- a/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/nullableTypes/uselessElvis.lazy.log
@@ -34,3 +34,47 @@ LazyJavaPackageFragment@8['lang'] {
     functions('equals': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+}
+
+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@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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
index 384b59294a3..4e708710eef 100644
--- a/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/characterIsNotANumber.lazy.log
@@ -39,3 +39,92 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
index f92fe504940..d8bf3dff606 100644
--- a/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/doublesInSimpleConstraints.lazy.log
@@ -38,10 +38,83 @@ LazyJavaPackageFragment@15['java'] {
 LazyJavaPackageFragment@17['lang'] {
     classes('either': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('id': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('toFloat': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
     functions('either': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
     functions('id': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('toFloat': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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]
+    <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 }
+    <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@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@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 }
+}
+
+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/numbers/intValuesOutOfRange.lazy.log b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
index 1272d5d5523..639009efc62 100644
--- a/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/intValuesOutOfRange.lazy.log
@@ -44,3 +44,45 @@ LazyJavaPackageFragment@18['lang'] {
     functions('foo': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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]
+    <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@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
diff --git a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
index a148f7e91e1..c555fe1dfd1 100644
--- a/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
+++ b/compiler/testData/diagnostics/tests/numbers/numbersInSimpleConstraints.lazy.log
@@ -42,21 +42,21 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@16['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 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@16['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -84,7 +84,7 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@41['Throwable']
+    classifier = JavaClassImpl@34['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -98,7 +98,7 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@46['Throwable'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
@@ -222,3 +222,525 @@ LazyJavaPackageFragment@84['lang'] {
     functions('use': Name@149) = EmptyList@137[empty] // through LazyPackageFragmentScopeForJavaPackage@140
     memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@140
 }
+
+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]
+    <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@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]
+    <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@159 {
+    <name not found> = ArrayList@160[1] { ResolutionCandidate@161 }
+    <name not found> = ArrayList@162[1] { ResolutionCandidate@161 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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@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@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@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@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> = 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[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 {
+    <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, ... }
+    <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 11e219bd877..64c4c39ee9e 100644
--- a/compiler/testData/diagnostics/tests/objects/Objects.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/Objects.lazy.log
@@ -48,11 +48,92 @@ LazyJavaPackageFragment@13['java'] {
 
 LazyJavaPackageFragment@15['lang'] {
     classes('foo': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('plus': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('x': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('y': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('x': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('y': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
     deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@41
     functions('foo': Name@40) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('plus': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@64 {
+    <name not found> = ArrayList@65[1] { ResolutionCandidate@66 }
+    <name not found> = ArrayList@67[1] { ResolutionCandidate@66 }
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+ResolutionTaskHolder@68 {
+    <name not found> = ArrayList@69[1] { ResolutionCandidate@70 }
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@70 }
+    <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 7a6259f660d..b26981d9f2e 100644
--- a/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/ObjectsLocal.lazy.log
@@ -43,9 +43,97 @@ LazyJavaPackageFragment@13['java'] {
 
 LazyJavaPackageFragment@15['lang'] {
     classes('B': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('foo': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
     deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('B': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('foo': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('B': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+}
+
+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]
+    <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@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 }
+}
+
+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]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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]
 }
diff --git a/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log b/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
index 9771ea771dc..6c738bb9032 100644
--- a/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/ObjectsNested.lazy.log
@@ -54,3 +54,885 @@ LazyJavaPackageFragment@15['lang'] {
     functions('A': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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 }
+    <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> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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> = 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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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> = 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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+    <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 }
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
+    <name not found> = EmptyList@36[empty]
+    <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]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = ArrayList@106[1] { ResolutionCandidate@107 }
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@107 }
+    <name not found> = EmptyList@36[empty]
+    <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]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@117 {
+    <name not found> = ArrayList@118[1] { ResolutionCandidate@119 }
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@119 }
+    <name not found> = EmptyList@36[empty]
+    <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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@155 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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 977d77860c1..7a8aeb12d4c 100644
--- a/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/invokeOnInnerObject.lazy.log
@@ -42,3 +42,94 @@ LazyJavaPackageFragment@10['lang'] {
     functions('invoke': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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]
+    <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@50 {
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@52 }
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log b/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
index 0f64f4bfaec..51f5a0b3cb7 100644
--- a/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/kt2240.lazy.log
@@ -41,3 +41,40 @@ LazyJavaPackageFragment@16['lang'] {
     functions('foo': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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]
+    <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@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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log b/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
index 1cc88ea6272..53b23591225 100644
--- a/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/kt5527.lazy.log
@@ -40,3 +40,145 @@ LazyJavaPackageFragment@11['lang'] {
     functions('useInt': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = ArrayList@43[1] { ResolutionCandidate@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]
+}
+
+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]
+    <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]
+}
+
+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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+}
diff --git a/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log b/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
index a545e753c6f..e1bcf7b8556 100644
--- a/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/localObjectInsideObject.lazy.log
@@ -30,16 +30,26 @@ LazyJavaPackageFragmentProvider@9 {
 
 LazyJavaPackageFragment@11['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
-LazyJavaPackageFragment@16['lang'] {
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
+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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log b/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
index 7894b09c1cf..ad00762ae07 100644
--- a/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/objects/localObjects.lazy.log
@@ -25,3 +25,26 @@ LazyJavaPackageFragment@6['java'] {
 LazyJavaPackageFragment@8['lang'] {
     deserializedPackageScope = Empty@12 // through LazyPackageFragmentScopeForJavaPackage@19
 }
+
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@26 }
+}
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
index 064c4334f03..7ddc5ff6049 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignOperatorAmbiguity.lazy.log
@@ -30,11 +30,105 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     classes('MyInt': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('i': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plusAssign': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('plusAssign': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
     deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
     functions('MyInt': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plusAssign': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('plusAssign': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <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@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@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[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> = 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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
index eaf38456c2c..c61f186f069 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/AssignmentOperations.lazy.log
@@ -79,3 +79,802 @@ LazyJavaPackageFragment@9['lang'] {
     functions('timesAssign': Name@30) = 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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = ArrayList@51[1] { ResolutionCandidate@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]
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <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@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@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]
+}
+
+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@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@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@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]
+    <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@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@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@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 }
+}
+
+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 }
+}
+
+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[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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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@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 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 ad7b1703826..ba0ed794cf9 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/IteratorAmbiguity.lazy.log
@@ -54,3 +54,94 @@ LazyJavaPackageFragment@14['lang'] {
     functions('iterator': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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> = 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]
+    <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 }
+    <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 19fbf148674..b946b1dcac8 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/assignmentOperationsCheckReturnType.lazy.log
@@ -14,48 +14,1292 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
     classes('B': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('plus': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('plusAssign': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('times': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('timesAssign': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('toByte': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('toShort': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('A': Name@14) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('B': Name@16) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('plus': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('plusAssign': Name@18) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('times': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('timesAssign': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('toByte': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('toShort': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('plusAssign': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('timesAssign': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('A': Name@14) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('B': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('plusAssign': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('timesAssign': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@15
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('B': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plusAssign': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('times': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('timesAssign': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('toByte': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('toShort': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('A': Name@14) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('B': Name@16) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@17) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plusAssign': Name@18) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('times': Name@19) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('timesAssign': Name@20) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('toByte': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('toShort': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('A': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('B': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('plusAssign': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('timesAssign': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('A': Name@14) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('B': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('plusAssign': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('timesAssign': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+    <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]
+    <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 }
+}
+
+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> = 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 }
+}
+
+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[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 }
+}
+
+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> = 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 }
+}
+
+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 }
+}
+
+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[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[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[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
+    <name not found> = ArrayList@249[7] { ResolutionCandidate@246, ResolutionCandidate@247, ResolutionCandidate@248, ... }
+}
+
+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, ... }
+}
+
+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@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@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@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[7] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
+    <name not found> = ArrayList@291[7] { ResolutionCandidate@288, ResolutionCandidate@289, ResolutionCandidate@290, ... }
+}
+
+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@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@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@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, ... }
+}
+
+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, ... }
+}
+
+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, ... }
+}
+
+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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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 {
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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 89ffefadc9a..1ed79b90839 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt1028.lazy.log
@@ -12,79 +12,64 @@ LazyJavaClassDescriptor@6['AbstractCollection'] {
     functions('iterator': Name@12) = ArrayList@13[1] { JavaMethodDescriptor@14['iterator'] } // through LazyJavaClassMemberScope@11
     functions('remove': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@17['remove'] } // through LazyJavaClassMemberScope@11
     memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@11
-    properties('add': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@11
-    properties('iterator': Name@21) = EmptyList@20[empty] // through LazyJavaClassMemberScope@11
-    properties('remove': Name@22) = EmptyList@20[empty] // through LazyJavaClassMemberScope@11
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@23['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@24['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@25['AbstractList'] {
-    defaultType = JetTypeImpl@26['AbstractList<1>']
-    functions('add': Name@27) = ArrayList@28[2] { JavaMethodDescriptor@29['add'], JavaMethodDescriptor@30['add'] } // through LazyJavaClassMemberScope@31
-    functions('iterator': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['iterator'] } // through LazyJavaClassMemberScope@31
-    functions('remove': Name@35) = ArrayList@36[2] { JavaMethodDescriptor@37['remove'], DeserializedSimpleFunctionDescriptor@38['remove'] } // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@31
-    properties('add': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@31
-    properties('iterator': Name@21) = EmptyList@20[empty] // through LazyJavaClassMemberScope@31
-    properties('remove': Name@22) = EmptyList@20[empty] // through LazyJavaClassMemberScope@31
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@40['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@41['AbstractList']
+LazyJavaClassDescriptor@21['AbstractList'] {
+    defaultType = JetTypeImpl@22['AbstractList<1>']
+    functions('add': Name@23) = ArrayList@24[2] { JavaMethodDescriptor@25['add'], JavaMethodDescriptor@26['add'] } // through LazyJavaClassMemberScope@27
+    functions('iterator': Name@28) = ArrayList@29[1] { JavaMethodDescriptor@30['iterator'] } // through LazyJavaClassMemberScope@27
+    functions('remove': Name@31) = ArrayList@32[2] { JavaMethodDescriptor@33['remove'], DeserializedSimpleFunctionDescriptor@34['remove'] } // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@27
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@37['AbstractList']
 }
 
-LazyJavaClassDescriptor@42['ArrayList'] {
-    constructors = ArrayList@43[3] { JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'] } // through LazyJavaClassMemberScope@47
-    defaultType = JetTypeImpl@48['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@49 // through LazyJavaClassMemberScope@47
+LazyJavaClassDescriptor@38['ArrayList'] {
+    constructors = ArrayList@39[3] { JavaConstructorDescriptor@40['<init>'], JavaConstructorDescriptor@41['<init>'], JavaConstructorDescriptor@42['<init>'] } // through LazyJavaClassMemberScope@43
+    defaultType = JetTypeImpl@44['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@43
     functionTypeForSamInterface = null
-    functions('add': Name@19) = ArrayList@50[2] { JavaMethodDescriptor@51['add'], JavaMethodDescriptor@52['add'] } // through LazyJavaClassMemberScope@47
-    functions('iterator': Name@21) = ArrayList@53[1] { JavaMethodDescriptor@54['iterator'] } // through LazyJavaClassMemberScope@47
-    functions('remove': Name@22) = ArrayList@55[2] { JavaMethodDescriptor@56['remove'], JavaMethodDescriptor@57['remove'] } // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@47
-    nestedClassIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@47
-    nestedClasses('add': Name@19) = null // through LazyJavaClassMemberScope@47
-    nestedClasses('iterator': Name@21) = null // through LazyJavaClassMemberScope@47
-    nestedClasses('remove': Name@22) = null // through LazyJavaClassMemberScope@47
-    properties('add': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@47
-    properties('iterator': Name@21) = EmptyList@20[empty] // through LazyJavaClassMemberScope@47
-    properties('remove': Name@22) = EmptyList@20[empty] // through LazyJavaClassMemberScope@47
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@60['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@61['ArrayList']
+    functions('add': Name@46) = ArrayList@47[2] { JavaMethodDescriptor@48['add'], JavaMethodDescriptor@49['add'] } // through LazyJavaClassMemberScope@43
+    functions('iterator': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['iterator'] } // through LazyJavaClassMemberScope@43
+    functions('remove': Name@53) = ArrayList@54[2] { JavaMethodDescriptor@55['remove'], JavaMethodDescriptor@56['remove'] } // through LazyJavaClassMemberScope@43
+    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@43
+    nestedClassIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@43
+    nestedClasses('add': Name@46) = null // through LazyJavaClassMemberScope@43
+    nestedClasses('iterator': Name@50) = null // through LazyJavaClassMemberScope@43
+    nestedClasses('remove': Name@53) = null // through LazyJavaClassMemberScope@43
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@59['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@60['ArrayList']
 }
 
-LazyJavaClassDescriptor@62['RandomAccess'] {
-    functions('add': Name@27) = EmptyList@20[empty] // through LazyJavaClassMemberScope@63
-    functions('iterator': Name@32) = EmptyList@20[empty] // through LazyJavaClassMemberScope@63
-    functions('remove': Name@35) = EmptyList@20[empty] // through LazyJavaClassMemberScope@63
+LazyJavaClassDescriptor@61['RandomAccess'] {
+    functions('add': Name@23) = EmptyList@62[empty] // through LazyJavaClassMemberScope@63
+    functions('iterator': Name@28) = EmptyList@62[empty] // through LazyJavaClassMemberScope@63
+    functions('remove': Name@31) = EmptyList@62[empty] // through LazyJavaClassMemberScope@63
     memberIndex = computeMemberIndex$1@64 // through LazyJavaClassMemberScope@63
-    properties('add': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@63
-    properties('iterator': Name@21) = EmptyList@20[empty] // through LazyJavaClassMemberScope@63
-    properties('remove': Name@22) = EmptyList@20[empty] // through LazyJavaClassMemberScope@63
     typeConstructor = LazyJavaClassTypeConstructor@65['RandomAccess']
 }
 
 LazyJavaClassDescriptor@66['Serializable'] {
-    functions('add': Name@27) = EmptyList@20[empty] // through LazyJavaClassMemberScope@67
-    functions('iterator': Name@32) = EmptyList@20[empty] // through LazyJavaClassMemberScope@67
-    functions('remove': Name@35) = EmptyList@20[empty] // through LazyJavaClassMemberScope@67
+    functions('add': Name@23) = EmptyList@62[empty] // through LazyJavaClassMemberScope@67
+    functions('iterator': Name@28) = EmptyList@62[empty] // through LazyJavaClassMemberScope@67
+    functions('remove': Name@31) = EmptyList@62[empty] // through LazyJavaClassMemberScope@67
     memberIndex = computeMemberIndex$1@68 // through LazyJavaClassMemberScope@67
-    properties('add': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@67
-    properties('iterator': Name@21) = EmptyList@20[empty] // through LazyJavaClassMemberScope@67
-    properties('remove': Name@22) = EmptyList@20[empty] // through LazyJavaClassMemberScope@67
     typeConstructor = LazyJavaClassTypeConstructor@69['Serializable']
 }
 
-LazyJavaClassTypeConstructor@24['AbstractCollection'] {
+LazyJavaClassTypeConstructor@20['AbstractCollection'] {
     parameters = ArrayList@70[1] { LazyJavaTypeParameterDescriptor@71['E'] }
     supertypes = ArrayList@72[1] { LazyJavaClassifierType@73['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@41['AbstractList'] {
+LazyJavaClassTypeConstructor@37['AbstractList'] {
     parameters = ArrayList@74[1] { LazyJavaTypeParameterDescriptor@75['E'] }
     supertypes = ArrayList@76[2] { LazyJavaClassifierType@77['AbstractCollection<E>'], LazyJavaClassifierType@78['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@61['ArrayList'] {
+LazyJavaClassTypeConstructor@60['ArrayList'] {
     parameters = ArrayList@79[1] { LazyJavaTypeParameterDescriptor@80['E'] }
     supertypes = ArrayList@81[5] { LazyJavaClassifierType@82['AbstractList<E>'], LazyJavaClassifierType@83['List<E>'], LazyJavaClassifierType@84['RandomAccess'], ... }
 }
@@ -104,14 +89,14 @@ LazyJavaClassifierType@77['AbstractCollection<E>'] {
     classifier = JavaClassImpl@92['AbstractCollection']
     memberScope = SubstitutingScope@93
     nullable = 'false': Boolean@94
-    typeConstructor = LazyJavaClassTypeConstructor@24['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractCollection']
 }
 
 LazyJavaClassifierType@82['AbstractList<E>'] {
     arguments = ArrayList@95[1] { TypeProjectionImpl@96 }
     classifier = JavaClassImpl@97['AbstractList']
     memberScope = SubstitutingScope@98
-    typeConstructor = LazyJavaClassTypeConstructor@41['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@37['AbstractList']
 }
 
 LazyJavaClassifierType@99['Cloneable'] {
@@ -155,112 +140,112 @@ LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
-LazyJavaClassifierType@128['E'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['E']
+LazyJavaClassifierType@127['E'] {
+    arguments = ArrayList@128[empty]
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['E']
+LazyJavaClassifierType@134['E'] {
+    arguments = ArrayList@135[empty]
+    classifier = JavaTypeParameterImpl@136['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
-LazyJavaClassifierType@138['E'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@140['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@141['E'] {
-    arguments = ArrayList@142[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@144['E'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@147['E'] {
-    arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@149['E']
+LazyJavaClassifierType@137['E'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaTypeParameterImpl@139['E']
     nullable = 'false': Boolean@94
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
+LazyJavaClassifierType@140['E'] {
+    arguments = ArrayList@141[empty]
+    classifier = JavaTypeParameterImpl@142['E']
+    nullable = 'false': Boolean@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+}
+
+LazyJavaClassifierType@143['E'] {
+    arguments = ArrayList@144[empty]
+    classifier = JavaTypeParameterImpl@145['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
+}
+
 LazyJavaClassifierType@150['E'] {
     arguments = ArrayList@151[empty]
     classifier = JavaTypeParameterImpl@152['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@153['E'] {
     arguments = ArrayList@154[empty]
     classifier = JavaTypeParameterImpl@155['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
     classifier = JavaTypeParameterImpl@158['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@159['E'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
     classifier = JavaTypeParameterImpl@164['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
 }
 
 LazyJavaClassifierType@165['E'] {
     arguments = ArrayList@166[empty]
     classifier = JavaTypeParameterImpl@167['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
 }
 
 LazyJavaClassifierType@168['E'] {
     arguments = ArrayList@169[empty]
     classifier = JavaTypeParameterImpl@170['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
 }
 
 LazyJavaClassifierType@171['E'] {
     arguments = ArrayList@172[empty]
     classifier = JavaTypeParameterImpl@173['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@174['E'] {
@@ -274,154 +259,154 @@ LazyJavaClassifierType@177['E'] {
     arguments = ArrayList@178[empty]
     classifier = JavaTypeParameterImpl@179['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@180['E'] {
     arguments = ArrayList@181[empty]
     classifier = JavaTypeParameterImpl@182['E']
     nullable = 'false': Boolean@94
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@183['E'] {
     arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@167['E']
+    classifier = JavaTypeParameterImpl@173['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@185['E'] {
     arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@140['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@187['E'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@122['E']
+    classifier = JavaTypeParameterImpl@139['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
+LazyJavaClassifierType@187['E'] {
+    arguments = ArrayList@188[empty]
+    classifier = JavaTypeParameterImpl@164['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+}
+
 LazyJavaClassifierType@189['E'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@130['E']
+    classifier = JavaTypeParameterImpl@182['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@191['E'] {
     arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@161['E']
+    classifier = JavaTypeParameterImpl@152['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@193['E'] {
     arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@173['E']
+    classifier = JavaTypeParameterImpl@161['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@195['E'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaTypeParameterImpl@155['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@197['E'] {
-    arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@158['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@199['E'] {
-    arguments = ArrayList@200[empty]
-    classifier = JavaTypeParameterImpl@133['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@201['E'] {
-    arguments = ArrayList@202[empty]
-    classifier = JavaTypeParameterImpl@170['E']
+    classifier = JavaTypeParameterImpl@145['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
+LazyJavaClassifierType@197['E'] {
+    arguments = ArrayList@198[empty]
+    classifier = JavaTypeParameterImpl@126['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+}
+
+LazyJavaClassifierType@199['E'] {
+    arguments = ArrayList@200[empty]
+    classifier = JavaTypeParameterImpl@142['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+}
+
+LazyJavaClassifierType@201['E'] {
+    arguments = ArrayList@202[empty]
+    classifier = JavaTypeParameterImpl@179['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+}
+
 LazyJavaClassifierType@203['E'] {
     arguments = ArrayList@204[empty]
+    classifier = JavaTypeParameterImpl@170['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+}
+
+LazyJavaClassifierType@205['E'] {
+    arguments = ArrayList@206[empty]
+    classifier = JavaTypeParameterImpl@133['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+}
+
+LazyJavaClassifierType@207['E'] {
+    arguments = ArrayList@208[empty]
+    classifier = JavaTypeParameterImpl@129['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+}
+
+LazyJavaClassifierType@209['E'] {
+    arguments = ArrayList@210[empty]
+    classifier = JavaTypeParameterImpl@122['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+}
+
+LazyJavaClassifierType@211['E'] {
+    arguments = ArrayList@212[empty]
+    classifier = JavaTypeParameterImpl@158['E']
+    nullable = 'true': Boolean@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+}
+
+LazyJavaClassifierType@213['E'] {
+    arguments = ArrayList@214[empty]
     classifier = JavaTypeParameterImpl@176['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
-LazyJavaClassifierType@205['E'] {
-    arguments = ArrayList@206[empty]
-    classifier = JavaTypeParameterImpl@137['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@207['E'] {
-    arguments = ArrayList@208[empty]
-    classifier = JavaTypeParameterImpl@164['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@209['E'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaTypeParameterImpl@143['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@211['E'] {
-    arguments = ArrayList@212[empty]
-    classifier = JavaTypeParameterImpl@152['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-}
-
-LazyJavaClassifierType@213['E'] {
-    arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@182['E']
-    nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
 LazyJavaClassifierType@215['E'] {
     arguments = ArrayList@216[empty]
-    classifier = JavaTypeParameterImpl@149['E']
+    classifier = JavaTypeParameterImpl@155['E']
     nullable = 'true': Boolean@114
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
 }
 
 LazyJavaClassifierType@217['E'] {
     arguments = ArrayList@218[empty]
-    classifier = JavaTypeParameterImpl@126['E']
+    classifier = JavaTypeParameterImpl@148['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
 }
 
 LazyJavaClassifierType@219['E'] {
     arguments = ArrayList@220[empty]
-    classifier = JavaTypeParameterImpl@179['E']
+    classifier = JavaTypeParameterImpl@167['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
 }
 
 LazyJavaClassifierType@221['E'] {
     arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@146['E']
+    classifier = JavaTypeParameterImpl@136['E']
     nullable = 'true': Boolean@114
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
 }
 
 LazyJavaClassifierType@223['Iterator<E>'] {
@@ -450,7 +435,7 @@ LazyJavaClassifierType@234['Iterator<E>'] {
 
 LazyJavaClassifierType@239['Iterator<E>'] {
     arguments = ArrayList@240[1] { TypeProjectionImpl@241 }
-    classifier = JavaClassImpl@226['Iterator']
+    classifier = JavaClassImpl@232['Iterator']
     memberScope = SubstitutingScope@242
     nullable = 'true': Boolean@114
     typeConstructor = DeserializedClassTypeConstructor@243
@@ -466,7 +451,7 @@ LazyJavaClassifierType@244['Iterator<E>'] {
 
 LazyJavaClassifierType@248['Iterator<E>'] {
     arguments = ArrayList@249[1] { TypeProjectionImpl@250 }
-    classifier = JavaClassImpl@232['Iterator']
+    classifier = JavaClassImpl@226['Iterator']
     memberScope = SubstitutingScope@251
     nullable = 'true': Boolean@114
     typeConstructor = DeserializedClassTypeConstructor@243
@@ -505,7 +490,7 @@ LazyJavaClassifierType@266['Object'] {
 
 LazyJavaClassifierType@269['Object'] {
     arguments = ArrayList@270[empty]
-    classifier = JavaClassImpl@263['Object']
+    classifier = JavaClassImpl@268['Object']
     memberScope = DeserializedClassMemberScope@264
     nullable = 'true': Boolean@114
     typeConstructor = DeserializedClassTypeConstructor@265
@@ -513,7 +498,7 @@ LazyJavaClassifierType@269['Object'] {
 
 LazyJavaClassifierType@271['Object'] {
     arguments = ArrayList@272[empty]
-    classifier = JavaClassImpl@268['Object']
+    classifier = JavaClassImpl@263['Object']
     memberScope = DeserializedClassMemberScope@264
     nullable = 'true': Boolean@114
     typeConstructor = DeserializedClassTypeConstructor@265
@@ -596,9 +581,9 @@ LazyJavaPackageFragmentProvider@284 {
     packageFragments('kt1028.event': FqName@334) = null
     packageFragments('kt1028.it': FqName@335) = null
     topLevelClasses(JavaClassImpl@92['AbstractCollection']) = LazyJavaClassDescriptor@6['AbstractCollection']
-    topLevelClasses(JavaClassImpl@97['AbstractList']) = LazyJavaClassDescriptor@25['AbstractList']
-    topLevelClasses(JavaClassImpl@336['ArrayList']) = LazyJavaClassDescriptor@42['ArrayList']
-    topLevelClasses(JavaClassImpl@280['RandomAccess']) = LazyJavaClassDescriptor@62['RandomAccess']
+    topLevelClasses(JavaClassImpl@97['AbstractList']) = LazyJavaClassDescriptor@21['AbstractList']
+    topLevelClasses(JavaClassImpl@336['ArrayList']) = LazyJavaClassDescriptor@38['ArrayList']
+    topLevelClasses(JavaClassImpl@280['RandomAccess']) = LazyJavaClassDescriptor@61['RandomAccess']
     topLevelClasses(JavaClassImpl@283['Serializable']) = LazyJavaClassDescriptor@66['Serializable']
 }
 
@@ -606,8 +591,8 @@ LazyJavaPackageFragment@295['java'] {
     classes('lang': Name@337) = null // through LazyPackageFragmentScopeForJavaPackage@338
     classes('util': Name@339) = null // through LazyPackageFragmentScopeForJavaPackage@338
     deserializedPackageScope = Empty@340 // through LazyPackageFragmentScopeForJavaPackage@338
-    functions('lang': Name@341) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@338
-    functions('util': Name@342) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@338
+    functions('lang': Name@341) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@338
+    functions('util': Name@342) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@338
     memberIndex = computeMemberIndex$1@343 // through LazyPackageFragmentScopeForJavaPackage@338
 }
 
@@ -616,147 +601,579 @@ LazyJavaPackageFragment@299['lang'] {
     classes('Control': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@345
     classes('MouseMoved': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@345
     classes('MouseMovedEventArgs': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('add': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@345
     classes('c': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('call': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('callbacks': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('event': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('hasNext': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('invoke': Name@354) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('it': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('next': Name@356) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('plus': Name@357) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('plusAssign': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@345
-    classes('remove': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@345
+    classes('callbacks': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@345
+    classes('event': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@345
+    classes('it': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@345
+    classes('plus': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@345
     deserializedPackageScope = Empty@340 // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('ArrayList': Name@344) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('Control': Name@346) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('MouseMovedEventArgs': Name@348) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('add': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('c': Name@349) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('call': Name@350) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('event': Name@352) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('hasNext': Name@353) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('invoke': Name@354) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('it': Name@359) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('iterator': Name@21) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('next': Name@356) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('plus': Name@357) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('plusAssign': Name@358) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    functions('remove': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@345
-    memberIndex = computeMemberIndex$1@360 // through LazyPackageFragmentScopeForJavaPackage@345
+    functions('ArrayList': Name@344) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
+    functions('Control': Name@346) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
+    functions('MouseMovedEventArgs': Name@348) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
+    functions('c': Name@349) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
+    functions('event': Name@351) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
+    functions('it': Name@354) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
+    functions('plus': Name@353) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@345
+    memberIndex = computeMemberIndex$1@355 // through LazyPackageFragmentScopeForJavaPackage@345
 }
 
 LazyJavaPackageFragment@308['util'] {
-    classes('ArrayList': Name@344) = LazyJavaClassDescriptor@42['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('Control': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('Function1': Name@362) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('Int': Name@363) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('MouseMoved': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('MouseMovedEventArgs': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('Unit': Name@364) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('add': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('c': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('call': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('callbacks': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('event': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('hasNext': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('invoke': Name@354) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('it': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('iterator': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('next': Name@356) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('plus': Name@357) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('plusAssign': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    classes('remove': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@361
-    deserializedPackageScope = Empty@340 // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('ArrayList': Name@344) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('Control': Name@346) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('MouseMovedEventArgs': Name@348) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('add': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('c': Name@349) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('call': Name@350) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('event': Name@352) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('hasNext': Name@353) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('invoke': Name@354) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('it': Name@359) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('iterator': Name@21) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('next': Name@356) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('plus': Name@357) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('plusAssign': Name@358) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    functions('remove': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@361
-    memberIndex = computeMemberIndex$1@365 // through LazyPackageFragmentScopeForJavaPackage@361
-}
-
-LazyJavaTypeParameterDescriptor@71['E'] {
-    defaultType = JetTypeImpl@366['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-    upperBounds = LinkedHashSet@367[1] { NullableType@368 }
-    upperBoundsAsType = NullableType@368
+    classes('ArrayList': Name@344) = LazyJavaClassDescriptor@38['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('Control': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('Function1': Name@357) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('Int': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('MouseMoved': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('MouseMovedEventArgs': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('Unit': Name@359) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('c': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('callbacks': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('event': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('it': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    classes('plus': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@356
+    deserializedPackageScope = Empty@340 // through LazyPackageFragmentScopeForJavaPackage@356
+    functions('ArrayList': Name@344) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
+    functions('Control': Name@346) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
+    functions('MouseMovedEventArgs': Name@348) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
+    functions('c': Name@349) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
+    functions('event': Name@351) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
+    functions('it': Name@354) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
+    functions('plus': Name@353) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@356
+    memberIndex = computeMemberIndex$1@360 // through LazyPackageFragmentScopeForJavaPackage@356
 }
 
 LazyJavaTypeParameterDescriptor@80['E'] {
-    defaultType = JetTypeImpl@369['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-    upperBounds = LinkedHashSet@370[1] { NullableType@371 }
-    upperBoundsAsType = NullableType@371
+    defaultType = JetTypeImpl@361['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
+    upperBounds = LinkedHashSet@362[1] { NullableType@363 }
+    upperBoundsAsType = NullableType@363
+}
+
+LazyJavaTypeParameterDescriptor@71['E'] {
+    defaultType = JetTypeImpl@364['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@149
+    upperBounds = LinkedHashSet@365[1] { NullableType@366 }
+    upperBoundsAsType = NullableType@366
 }
 
 LazyJavaTypeParameterDescriptor@75['E'] {
-    defaultType = JetTypeImpl@372['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@123
-    upperBounds = LinkedHashSet@373[1] { NullableType@374 }
-    upperBoundsAsType = NullableType@374
+    defaultType = JetTypeImpl@367['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    upperBounds = LinkedHashSet@368[1] { NullableType@369 }
+    upperBoundsAsType = NullableType@369
 }
 
-LazyJavaTypeParameterResolver@375 {
-    resolve(JavaTypeParameterImpl@376['E']) = LazyJavaTypeParameterDescriptor@71['E']
+LazyJavaTypeParameterResolver@370 {
+    resolve(JavaTypeParameterImpl@371['E']) = LazyJavaTypeParameterDescriptor@75['E']
+}
+
+LazyJavaTypeParameterResolver@372 {
+    resolve(JavaTypeParameterImpl@373['E']) = LazyJavaTypeParameterDescriptor@71['E']
+}
+
+LazyJavaTypeParameterResolver@374 {
+    resolve(JavaTypeParameterImpl@375['E']) = LazyJavaTypeParameterDescriptor@80['E']
+}
+
+LazyJavaTypeParameterResolver@376 {
+    resolve(JavaTypeParameterImpl@176['E']) = null
 }
 
 LazyJavaTypeParameterResolver@377 {
-    resolve(JavaTypeParameterImpl@378['E']) = LazyJavaTypeParameterDescriptor@80['E']
+    resolve(JavaTypeParameterImpl@152['E']) = null
+}
+
+LazyJavaTypeParameterResolver@378 {
+    resolve(JavaTypeParameterImpl@133['E']) = null
 }
 
 LazyJavaTypeParameterResolver@379 {
-    resolve(JavaTypeParameterImpl@380['E']) = LazyJavaTypeParameterDescriptor@75['E']
-}
-
-LazyJavaTypeParameterResolver@381 {
     resolve(JavaTypeParameterImpl@155['E']) = null
 }
 
+LazyJavaTypeParameterResolver@380 {
+    resolve(JavaTypeParameterImpl@170['E']) = null
+}
+
+LazyJavaTypeParameterResolver@381 {
+    resolve(JavaTypeParameterImpl@129['E']) = null
+}
+
 LazyJavaTypeParameterResolver@382 {
-    resolve(JavaTypeParameterImpl@167['E']) = null
+    resolve(JavaTypeParameterImpl@136['E']) = null
 }
 
 LazyJavaTypeParameterResolver@383 {
-    resolve(JavaTypeParameterImpl@146['E']) = null
+    resolve(JavaTypeParameterImpl@179['E']) = null
 }
 
 LazyJavaTypeParameterResolver@384 {
-    resolve(JavaTypeParameterImpl@152['E']) = null
+    resolve(JavaTypeParameterImpl@145['E']) = null
 }
 
 LazyJavaTypeParameterResolver@385 {
     resolve(JavaTypeParameterImpl@164['E']) = null
 }
 
-LazyJavaTypeParameterResolver@386 {
-    resolve(JavaTypeParameterImpl@149['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]
+    <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]
 }
 
-LazyJavaTypeParameterResolver@387 {
-    resolve(JavaTypeParameterImpl@179['E']) = null
+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]
+    <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]
 }
 
-LazyJavaTypeParameterResolver@388 {
-    resolve(JavaTypeParameterImpl@122['E']) = null
+ResolutionTaskHolder@394 {
+    <name not found> = ArrayList@395[1] { ResolutionCandidate@396 }
+    <name not found> = ArrayList@397[1] { ResolutionCandidate@396 }
+    <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]
 }
 
-LazyJavaTypeParameterResolver@389 {
-    resolve(JavaTypeParameterImpl@158['E']) = null
+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]
 }
 
-LazyJavaTypeParameterResolver@390 {
-    resolve(JavaTypeParameterImpl@182['E']) = null
+ResolutionTaskHolder@402 {
+    <name not found> = ArrayList@403[1] { ResolutionCandidate@404 }
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@404 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@406 {
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@408 }
+    <name not found> = ArrayList@409[1] { ResolutionCandidate@408 }
+    <name not found> = EmptyList@62[empty]
+    <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@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@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[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]
+    <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@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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+ResolutionTaskHolder@521 {
+    <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 352af841c5b..d91d3754750 100644
--- a/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
+++ b/compiler/testData/diagnostics/tests/operatorsOverloading/kt3450.lazy.log
@@ -44,46 +44,208 @@ LazyJavaPackageFragment@8['<root>'] {
     classes('Unit': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('data': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('div': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('get': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('to': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('A': Name@35) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('B': Name@37) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Pair': Name@38) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('div': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('get': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('to': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('plus': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('to': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('A': Name@35) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('B': Name@37) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('Pair': Name@38) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('div': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('plus': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('to': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@16['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
 LazyJavaPackageFragment@18['lang'] {
-    classes('A': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('B': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Pair': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('div': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('get': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('invoke': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('plus': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('to': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('A': Name@35) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('B': Name@37) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('Pair': Name@38) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('div': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('get': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('invoke': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('plus': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('to': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('A': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('B': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Pair': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('div': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('plus': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('to': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('A': Name@35) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('B': Name@37) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('Pair': Name@38) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('div': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('plus': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('to': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
+}
+
+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> = 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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@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]
+    <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]
+    <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 }
+    <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@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@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@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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log b/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
index 73baac43f39..418b000d853 100644
--- a/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
+++ b/compiler/testData/diagnostics/tests/overload/SyntheticAndNotSynthetic.lazy.log
@@ -60,28 +60,45 @@ LazyJavaPackageFragment@43['<root>'] {
     classes('Runnable': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('Unit': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
     classes('f': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('invoke': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('Runnable': Name@65) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@60
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('Runnable': Name@64) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     functions('f': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('invoke': Name@63) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@60
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@60
 }
 
 LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('lang': Name@69) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('lang': Name@68) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@49['lang'] {
-    classes('Runnable': Name@59) = LazyJavaClassDescriptor@4['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('f': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('invoke': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@64 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('Runnable': Name@65) = ArrayList@72[1] { SamConstructorDescriptor@73['Runnable'] } // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('f': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('invoke': Name@63) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('Runnable': Name@59) = LazyJavaClassDescriptor@4['Runnable'] // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('f': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('Runnable': Name@64) = ArrayList@71[1] { SamConstructorDescriptor@72['Runnable'] } // through LazyPackageFragmentScopeForJavaPackage@70
+    functions('f': Name@62) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@70
+    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@70
+}
+
+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@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]
+    <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 f4579412f09..1d864d09536 100644
--- a/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
+++ b/compiler/testData/diagnostics/tests/overload/kt1998.lazy.log
@@ -34,3 +34,19 @@ LazyJavaPackageFragment@10['java'] {
 LazyJavaPackageFragment@12['lang'] {
     deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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> = EmptyList@26[empty]
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log b/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
index d26982b0173..c68dc9a7466 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractFunImplemented.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 1c816a9602b..c9b666b0931 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractFunNotImplemented.lazy.log
@@ -24,3 +24,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 98aa7fb6625..d043a961e7a 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractValImplemented.lazy.log
@@ -29,3 +29,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+ResolutionTaskHolder@28 {
+    <name not found> = ArrayList@29[1] { ResolutionCandidate@30 }
+    <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 1c816a9602b..c9b666b0931 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractValNotImplemented.lazy.log
@@ -24,3 +24,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 d26982b0173..c68dc9a7466 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractVarImplemented.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 1c816a9602b..c9b666b0931 100644
--- a/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AbstractVarNotImplemented.lazy.log
@@ -24,3 +24,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 868a481a4ac..3d22aae09ae 100644
--- a/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.lazy.log
@@ -38,3 +38,41 @@ LazyJavaPackageFragment@12['lang'] {
     classes('a': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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@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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log b/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
index 868a481a4ac..f89a7b8b601 100644
--- a/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.lazy.log
@@ -38,3 +38,15 @@ LazyJavaPackageFragment@12['lang'] {
     classes('a': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
index 95d50f6d99f..0472e9a4c48 100644
--- a/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ComplexValRedeclaration.lazy.log
@@ -29,6 +29,12 @@ LazyJavaPackageFragment@7['java'] {
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log b/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
index 9018f2cf3bb..66bdefa8ec0 100644
--- a/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ConflictingFunctionSignatureFromSuperclass.lazy.log
@@ -22,3 +22,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+ResolutionTaskHolder@22 {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+    <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 09ffe89532c..6c56d847fa9 100644
--- a/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ConflictingPropertySignatureFromSuperclass.lazy.log
@@ -24,3 +24,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 4c42cb68d87..45a11cf3d10 100644
--- a/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DefaultParameterValueInOverride.lazy.log
@@ -25,3 +25,13 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/Delegation.lazy.log b/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
index 97dddf41852..b6578388157 100644
--- a/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/Delegation.lazy.log
@@ -39,3 +39,33 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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@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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log b/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
index 91942a99788..e8b1f24f55b 100644
--- a/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DelegationFun.lazy.log
@@ -19,3 +19,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@19) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
+
+ResolutionTaskHolder@22 {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+    <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 d2e43dad139..5b57884103d 100644
--- a/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DelegationVal.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <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 d2e43dad139..5b57884103d 100644
--- a/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/DelegationVar.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <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 b935bf3a802..4a0e2c35a07 100644
--- a/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/EqualityOfIntersectionTypes.lazy.log
@@ -37,3 +37,29 @@ LazyJavaPackageFragment@10['java'] {
 LazyJavaPackageFragment@12['lang'] {
     deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+    <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/override/ExtendFunctionClass.lazy.log b/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
index 098a8766d45..11f1234ede8 100644
--- a/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ExtendFunctionClass.lazy.log
@@ -29,6 +29,7 @@ LazyJavaPackageFragment@13['java'] {
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@15['lang'] {
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <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 0c1214d1b6a..b7b45c62a8e 100644
--- a/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/FakeOverrideAbstractAndNonAbstractFun.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <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 c66b4b3d2d5..834fea0262d 100644
--- a/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/FakeOverrideDifferentDeclarationSignatures.lazy.log
@@ -36,3 +36,13 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/Generics.lazy.log b/compiler/testData/diagnostics/tests/override/Generics.lazy.log
index 18d4d931bb4..96848203279 100644
--- a/compiler/testData/diagnostics/tests/override/Generics.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/Generics.lazy.log
@@ -76,6 +76,172 @@ LazyJavaPackageFragment@27['java'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@29['lang'] {
-    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@76
+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 }
+}
+
+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> = 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 }
+}
+
+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 }
+}
+
+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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log b/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
index 4c70cc40dbb..c5be54ce755 100644
--- a/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/InvisiblePotentialOverride.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <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 14c7c794d52..5bfe260b256 100644
--- a/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/MissingDelegate.lazy.log
@@ -36,3 +36,39 @@ LazyJavaPackageFragment@9['lang'] {
     functions('Base2': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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 d38237214d9..181cdf98e04 100644
--- a/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/MultipleDefaultsAndNamesInSupertypes.lazy.log
@@ -26,16 +26,21 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
+    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@13['lang'] {
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@33
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log b/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
index 514e9530502..50b3f0110c7 100644
--- a/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/NonGenerics.lazy.log
@@ -49,3 +49,142 @@ LazyJavaPackageFragment@11['java'] {
 LazyJavaPackageFragment@13['lang'] {
     deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@46
 }
+
+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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log b/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
index add1834b2d9..a6453a88d65 100644
--- a/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ObjectDelegationManyImpl.lazy.log
@@ -33,3 +33,17 @@ LazyJavaPackageFragment@9['java'] {
 LazyJavaPackageFragment@11['lang'] {
     deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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 }
+    <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 5f605782d82..b4129b01928 100644
--- a/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/OverridingFinalMember.lazy.log
@@ -17,3 +17,8 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
     memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
 }
+
+ResolutionTaskHolder@20 {
+    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+    <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 e1c4f5ccc5e..464ae3cd17e 100644
--- a/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ParentInheritsManyImplementations.lazy.log
@@ -37,3 +37,8 @@ LazyJavaPackageFragment@17['java'] {
     functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+ResolutionTaskHolder@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <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 62465806d3e..3ee01cc9ff3 100644
--- a/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/PropertyInConstructor.lazy.log
@@ -30,3 +30,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <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 8b96073b5cd..7532202633b 100644
--- a/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.lazy.log
@@ -42,3 +42,15 @@ LazyJavaPackageFragment@13['lang'] {
     classes('a': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log b/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
index 1c63eb57df9..87216c996b9 100644
--- a/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/SuspiciousCase1.lazy.log
@@ -35,22 +35,21 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
     classes('String': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('quux': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('quux': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('lang': Name@39) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
-LazyJavaPackageFragment@15['lang'] {
-    classes('quux': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
-    functions('quux': Name@36) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/override/kt1862.lazy.log b/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
index 66500ae4b5c..a0ec993bf57 100644
--- a/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt1862.lazy.log
@@ -28,3 +28,13 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/kt2491.lazy.log b/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
index 94d546cf665..c0d3dce139b 100644
--- a/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt2491.lazy.log
@@ -25,3 +25,13 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/kt4763.lazy.log b/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
index 4638951710c..b7046a22cf6 100644
--- a/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4763.lazy.log
@@ -36,3 +36,13 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log b/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
index 1adf6567ff0..a03850c5e74 100644
--- a/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4763property.lazy.log
@@ -40,3 +40,13 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/kt4785.lazy.log b/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
index 37bf3a9c951..17d4e23c58a 100644
--- a/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4785.lazy.log
@@ -25,3 +25,13 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log b/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
index daf2a6ce19d..fad87a0842f 100644
--- a/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt4785delegation.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@7['java'] {
     functions('lang': Name@20) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@18
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@18
 }
+
+ResolutionTaskHolder@23 {
+    <name not found> = ArrayList@24[1] { ResolutionCandidate@25 }
+    <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 622a570a439..39f7422ae56 100644
--- a/compiler/testData/diagnostics/tests/override/kt880.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/kt880.lazy.log
@@ -38,3 +38,17 @@ LazyJavaPackageFragment@10['lang'] {
     functions('test': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
index c1d6eb79fd3..ed8b02ee014 100644
--- a/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/parameterNames/differentNamesInSupertypesDiagnostic.lazy.log
@@ -146,3 +146,24 @@ LazyJavaPackageFragment@62['lang'] {
     functions('UnsupportedOperationException': Name@75) = EmptyList@77[empty] // through LazyPackageFragmentScopeForJavaPackage@83
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
index d10616e6d6f..ed85c0b5c03 100644
--- a/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
+++ b/compiler/testData/diagnostics/tests/override/parameterNames/kjkWithSeveralSupers.lazy.log
@@ -120,7 +120,7 @@ LazyJavaClassTypeConstructor@111['Sub3'] {
     supertypes = ArrayList@128[3] { LazyJavaClassifierType@129['JSuper1'], LazyJavaClassifierType@130['JSuper2'], LazyJavaClassifierType@131['KSuper'] }
 }
 
-LazyJavaClassifierType@120['JSuper1'] {
+LazyJavaClassifierType@124['JSuper1'] {
     arguments = ArrayList@132[empty]
     classifier = JavaClassImpl@133['JSuper1']
     memberScope = LazyJavaClassMemberScope@4
@@ -128,7 +128,7 @@ LazyJavaClassifierType@120['JSuper1'] {
     typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
 }
 
-LazyJavaClassifierType@124['JSuper1'] {
+LazyJavaClassifierType@129['JSuper1'] {
     arguments = ArrayList@135[empty]
     classifier = JavaClassImpl@136['JSuper1']
     memberScope = LazyJavaClassMemberScope@4
@@ -136,7 +136,7 @@ LazyJavaClassifierType@124['JSuper1'] {
     typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
 }
 
-LazyJavaClassifierType@129['JSuper1'] {
+LazyJavaClassifierType@120['JSuper1'] {
     arguments = ArrayList@137[empty]
     classifier = JavaClassImpl@138['JSuper1']
     memberScope = LazyJavaClassMemberScope@4
@@ -144,7 +144,7 @@ LazyJavaClassifierType@129['JSuper1'] {
     typeConstructor = LazyJavaClassTypeConstructor@24['JSuper1']
 }
 
-LazyJavaClassifierType@126['JSuper2'] {
+LazyJavaClassifierType@121['JSuper2'] {
     arguments = ArrayList@139[empty]
     classifier = JavaClassImpl@140['JSuper2']
     memberScope = LazyJavaClassMemberScope@27
@@ -152,7 +152,7 @@ LazyJavaClassifierType@126['JSuper2'] {
     typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
 }
 
-LazyJavaClassifierType@130['JSuper2'] {
+LazyJavaClassifierType@126['JSuper2'] {
     arguments = ArrayList@141[empty]
     classifier = JavaClassImpl@142['JSuper2']
     memberScope = LazyJavaClassMemberScope@27
@@ -160,7 +160,7 @@ LazyJavaClassifierType@130['JSuper2'] {
     typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
 }
 
-LazyJavaClassifierType@121['JSuper2'] {
+LazyJavaClassifierType@130['JSuper2'] {
     arguments = ArrayList@143[empty]
     classifier = JavaClassImpl@144['JSuper2']
     memberScope = LazyJavaClassMemberScope@27
@@ -168,7 +168,7 @@ LazyJavaClassifierType@121['JSuper2'] {
     typeConstructor = LazyJavaClassTypeConstructor@38['JSuper2']
 }
 
-LazyJavaClassifierType@119['KSuper'] {
+LazyJavaClassifierType@125['KSuper'] {
     arguments = ArrayList@145[empty]
     classifier = JavaClassImpl@146['KSuper']
     memberScope = WritableScopeImpl@147
@@ -176,7 +176,7 @@ LazyJavaClassifierType@119['KSuper'] {
     typeConstructor = TypeConstructorImpl$1@148
 }
 
-LazyJavaClassifierType@125['KSuper'] {
+LazyJavaClassifierType@131['KSuper'] {
     arguments = ArrayList@149[empty]
     classifier = JavaClassImpl@150['KSuper']
     memberScope = WritableScopeImpl@147
@@ -184,7 +184,7 @@ LazyJavaClassifierType@125['KSuper'] {
     typeConstructor = TypeConstructorImpl$1@148
 }
 
-LazyJavaClassifierType@131['KSuper'] {
+LazyJavaClassifierType@119['KSuper'] {
     arguments = ArrayList@151[empty]
     classifier = JavaClassImpl@152['KSuper']
     memberScope = WritableScopeImpl@147
@@ -225,8 +225,8 @@ LazyJavaPackageFragmentProvider@158 {
     packageFragments('kotlin.Sub3': FqName@181) = null
     packageFragments('kotlin.io': FqName@182) = null
     packageFragments('kotlin.jvm': FqName@183) = null
-    topLevelClasses(JavaClassImpl@133['JSuper1']) = LazyJavaClassDescriptor@0['JSuper1']
-    topLevelClasses(JavaClassImpl@144['JSuper2']) = LazyJavaClassDescriptor@25['JSuper2']
+    topLevelClasses(JavaClassImpl@138['JSuper1']) = LazyJavaClassDescriptor@0['JSuper1']
+    topLevelClasses(JavaClassImpl@140['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 0d16dd23b7b..40b6161f9e9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/collectionOrNull.lazy.log
@@ -125,3 +125,49 @@ LazyJavaPackageFragment@63['p'] {
     functions('foo': Name@73) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
 }
+
+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]
+    <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@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]
+    <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/commonSupertype/inferenceWithBound.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
index 8c80f12a98b..bf829a8ac90 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/inferenceWithBound.lazy.log
@@ -88,14 +88,14 @@ LazyJavaClassifierType@52['Sub'] {
 
 LazyJavaClassifierType@55['Sub'] {
     arguments = ArrayList@56[empty]
-    classifier = JavaClassImpl@51['Sub']
+    classifier = JavaClassImpl@54['Sub']
     nullable = 'true': Boolean@35
     typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
 }
 
 LazyJavaClassifierType@57['Sub'] {
     arguments = ArrayList@58[empty]
-    classifier = JavaClassImpl@54['Sub']
+    classifier = JavaClassImpl@51['Sub']
     nullable = 'true': Boolean@35
     typeConstructor = LazyJavaClassTypeConstructor@16['Sub']
 }
@@ -123,14 +123,14 @@ LazyJavaClassifierType@64['Super'] {
 
 LazyJavaClassifierType@67['Super'] {
     arguments = ArrayList@68[empty]
-    classifier = JavaClassImpl@61['Super']
+    classifier = JavaClassImpl@66['Super']
     nullable = 'true': Boolean@35
     typeConstructor = LazyJavaClassTypeConstructor@18['Super']
 }
 
 LazyJavaClassifierType@69['Super'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@66['Super']
+    classifier = JavaClassImpl@61['Super']
     nullable = 'true': Boolean@35
     typeConstructor = LazyJavaClassTypeConstructor@18['Super']
 }
@@ -173,41 +173,109 @@ LazyJavaPackageFragment@73['<root>'] {
     classes('List': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@106
     classes('Other': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@106
     classes('Super': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('compareTo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('p': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('compareTo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@111) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('p': Name@114) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('foo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('p': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('foo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('p': Name@113) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
 LazyJavaPackageFragment@80['java'] {
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('lang': Name@118) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('lang': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('lang': Name@117) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
 LazyJavaPackageFragment@82['lang'] {
-    classes('compareTo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('compareTo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('foo': Name@111) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('foo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('foo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@119
 }
 
 LazyJavaPackageFragment@97['p'] {
-    classes('Collection': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('List': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Other': Name@108) = LazyJavaClassDescriptor@0['Other'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Super': Name@109) = LazyJavaClassDescriptor@17['Super'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('compareTo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('compareTo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@111) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('Collection': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('List': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Other': Name@108) = LazyJavaClassDescriptor@0['Other'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Super': Name@109) = LazyJavaClassDescriptor@17['Super'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foo': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foo': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
+}
+
+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]
+    <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]
+    <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@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[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]
+    <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@158 {
+    <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/platformTypes/commonSupertype/mixedElvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
index 7f3cc9089f3..b0ba323b8b1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedElvis.lazy.log
@@ -109,91 +109,91 @@ LazyJavaClassifierType@72['E'] {
     arguments = ArrayList@73[empty]
     classifier = JavaTypeParameterImpl@74['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
-LazyJavaClassifierType@76['E'] {
-    arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+LazyJavaClassifierType@75['E'] {
+    arguments = ArrayList@76[empty]
+    classifier = JavaTypeParameterImpl@77['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
-LazyJavaClassifierType@80['E'] {
-    arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@82['E']
+LazyJavaClassifierType@79['E'] {
+    arguments = ArrayList@80[empty]
+    classifier = JavaTypeParameterImpl@81['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
 }
 
 LazyJavaClassifierType@83['E'] {
     arguments = ArrayList@84[empty]
     classifier = JavaTypeParameterImpl@85['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@86['E'] {
     arguments = ArrayList@87[empty]
     classifier = JavaTypeParameterImpl@88['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@89['E'] {
     arguments = ArrayList@90[empty]
     classifier = JavaTypeParameterImpl@91['E']
     nullable = 'false': Boolean@42
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@92['E'] {
     arguments = ArrayList@93[empty]
-    classifier = JavaTypeParameterImpl@91['E']
-    nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-}
-
-LazyJavaClassifierType@94['E'] {
-    arguments = ArrayList@95[empty]
     classifier = JavaTypeParameterImpl@70['E']
     nullable = 'true': Boolean@62
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
+LazyJavaClassifierType@94['E'] {
+    arguments = ArrayList@95[empty]
+    classifier = JavaTypeParameterImpl@77['E']
+    nullable = 'true': Boolean@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+}
+
 LazyJavaClassifierType@96['E'] {
     arguments = ArrayList@97[empty]
-    classifier = JavaTypeParameterImpl@78['E']
+    classifier = JavaTypeParameterImpl@88['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@98['E'] {
     arguments = ArrayList@99[empty]
-    classifier = JavaTypeParameterImpl@74['E']
+    classifier = JavaTypeParameterImpl@91['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
-    classifier = JavaTypeParameterImpl@82['E']
+    classifier = JavaTypeParameterImpl@74['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
 }
 
 LazyJavaClassifierType@102['E'] {
     arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@85['E']
+    classifier = JavaTypeParameterImpl@81['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
 }
 
 LazyJavaClassifierType@104['E'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@88['E']
+    classifier = JavaTypeParameterImpl@85['E']
     nullable = 'true': Boolean@62
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
 }
 
 LazyJavaClassifierType@26['List<E>'] {
@@ -291,68 +291,109 @@ LazyJavaPackageFragment@131['<root>'] {
     classes('ArrayList': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@172
     classes('MutableList': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@172
     classes('String': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('get': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('java': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('set': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    classes('tests': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@172
-    deserializedPackageScope = Empty@180 // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('ArrayList': Name@181) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('get': Name@176) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('java': Name@183) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('set': Name@178) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    functions('tests': Name@184) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@172
-    memberIndex = computeMemberIndex$1@185 // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('java': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('tests': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('ArrayList': Name@179) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('java': Name@181) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('tests': Name@182) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    memberIndex = computeMemberIndex$1@183 // through LazyPackageFragmentScopeForJavaPackage@172
 }
 
 LazyJavaPackageFragment@139['java'] {
-    classes('lang': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('util': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    deserializedPackageScope = Empty@180 // through LazyPackageFragmentScopeForJavaPackage@187
-    functions('lang': Name@189) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    functions('util': Name@190) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@187
+    classes('lang': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('util': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('lang': Name@187) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('util': Name@188) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    memberIndex = computeMemberIndex$1@189 // through LazyPackageFragmentScopeForJavaPackage@185
 }
 
 LazyJavaPackageFragment@143['lang'] {
-    classes('ArrayList': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('get': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('set': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    deserializedPackageScope = Empty@180 // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('ArrayList': Name@181) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('get': Name@176) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    functions('set': Name@178) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    memberIndex = computeMemberIndex$1@193 // through LazyPackageFragmentScopeForJavaPackage@192
+    classes('ArrayList': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@190
+    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@190
+    functions('ArrayList': Name@179) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@190
+    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@190
 }
 
 LazyJavaPackageFragment@151['util'] {
-    classes('ArrayList': Name@194) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@195
-    deserializedPackageScope = Empty@180 // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('ArrayList': Name@196) = EmptyList@182[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    memberIndex = computeMemberIndex$1@197 // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('ArrayList': Name@192) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@193
+    deserializedPackageScope = Empty@178 // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('ArrayList': Name@194) = EmptyList@180[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@193
 }
 
 LazyJavaTypeParameterDescriptor@28['E'] {
-    defaultType = JetTypeImpl@198['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@79
-    upperBounds = LinkedHashSet@199[1] { NullableType@200 }
+    defaultType = JetTypeImpl@196['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@78
+    upperBounds = LinkedHashSet@197[1] { NullableType@198 }
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@82
 }
 
 LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@75
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@71
+}
+
+LazyJavaTypeParameterResolver@199 {
+    resolve(JavaTypeParameterImpl@200['E']) = LazyJavaTypeParameterDescriptor@23['E']
 }
 
 LazyJavaTypeParameterResolver@201 {
-    resolve(JavaTypeParameterImpl@202['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@202['E']) = LazyJavaTypeParameterDescriptor@28['E']
 }
 
 LazyJavaTypeParameterResolver@203 {
-    resolve(JavaTypeParameterImpl@204['E']) = LazyJavaTypeParameterDescriptor@23['E']
+    resolve(JavaTypeParameterImpl@204['E']) = LazyJavaTypeParameterDescriptor@19['E']
 }
 
-LazyJavaTypeParameterResolver@205 {
-    resolve(JavaTypeParameterImpl@206['E']) = LazyJavaTypeParameterDescriptor@28['E']
+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[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[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]
+    <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 a134db5bccc..678c2a3bcd3 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/mixedIf.lazy.log
@@ -55,14 +55,14 @@ LazyJavaClassifierType@34['String'] {
 
 LazyJavaClassifierType@37['String'] {
     arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@32['String']
+    classifier = JavaClassImpl@36['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@33
 }
 
 LazyJavaClassifierType@39['String'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@36['String']
+    classifier = JavaClassImpl@32['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@33
 }
@@ -138,3 +138,45 @@ LazyJavaTypeParameterDescriptor@15['G'] {
 LazyJavaTypeParameterResolver@96 {
     resolve(JavaTypeParameterImpl@97['G']) = LazyJavaTypeParameterDescriptor@15['G']
 }
+
+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@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> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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 6584ae16961..a45e92d3228 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/recursiveGeneric.lazy.log
@@ -127,3 +127,43 @@ LazyJavaTypeParameterDescriptor@13['T'] {
 LazyJavaTypeParameterResolver@78 {
     resolve(JavaTypeParameterImpl@79['T']) = LazyJavaTypeParameterDescriptor@13['T']
 }
+
+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[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> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
index f4187ed12ca..f03247cb182 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/stringOrNull.lazy.log
@@ -101,3 +101,49 @@ LazyJavaPackageFragment@50['p'] {
     functions('foo': Name@60) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@71
     memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
+
+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]
+    <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@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]
+    <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/platformTypes/commonSupertype/typeOfElvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
index 57ba73a87a0..cf089e229b5 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/typeOfElvis.lazy.log
@@ -8,7 +8,6 @@ LazyJavaClassDescriptor@0['J'] {
     nestedClassIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@2
     nestedClasses('equals': Name@3) = null // through LazyJavaClassMemberScope@2
     nestedClasses('j': Name@6) = null // through LazyJavaClassMemberScope@2
-    properties('equals': Name@3) = EmptyList@10[empty] // through LazyJavaClassMemberScope@2
     properties('j': Name@6) = EmptyList@10[empty] // through LazyJavaClassMemberScope@2
     properties('j': Name@6) = EmptyList@10[empty] // through LazyJavaStaticClassScope@9
     typeConstructor = LazyJavaClassTypeConstructor@14['J']
@@ -65,11 +64,9 @@ LazyJavaPackageFragment@30['<root>'] {
     classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('J': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('equals': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
     classes('p': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
     deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('equals': Name@3) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     functions('foo': Name@57) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     functions('p': Name@60) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@54
@@ -83,10 +80,8 @@ LazyJavaPackageFragment@35['java'] {
 }
 
 LazyJavaPackageFragment@37['lang'] {
-    classes('equals': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@66
     classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@66
     deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('equals': Name@3) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     functions('foo': Name@57) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@66
     memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
 }
@@ -95,10 +90,54 @@ LazyJavaPackageFragment@48['p'] {
     classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@68
     classes('J': Name@55) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@68
     classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('equals': Name@3) = null // through LazyPackageFragmentScopeForJavaPackage@68
     classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@68
     deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('equals': Name@3) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     functions('foo': Name@57) = EmptyList@10[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
 }
+
+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]
+    <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@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]
+    <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/platformTypes/commonSupertype/withNothing.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
index 97ef96c46a4..24b72912cc3 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/commonSupertype/withNothing.lazy.log
@@ -137,3 +137,106 @@ LazyJavaPackageFragment@59['p'] {
     functions('out': Name@83) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@96
     memberIndex = computeMemberIndex$1@97 // through LazyPackageFragmentScopeForJavaPackage@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 }
+    <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@106 {
+    <name not found> = ArrayList@107[1] { ResolutionCandidate@108 }
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@108 }
+    <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@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@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 }
+}
+
+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> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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 e314787cf61..5dae1f7d80d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/dereference.lazy.log
@@ -7,115 +7,209 @@ LazyJavaClassDescriptor@0['J'] {
     nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
     nestedClasses('foo': Name@4) = null // through LazyJavaClassMemberScope@3
     nestedClasses('j': Name@7) = null // through LazyJavaClassMemberScope@3
-    properties('foo': Name@4) = EmptyList@12[empty] // through LazyJavaClassMemberScope@3
-    properties('j': Name@7) = EmptyList@12[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@13['J']
 }
 
-LazyJavaClassTypeConstructor@14['J'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
+LazyJavaClassTypeConstructor@13['J'] {
+    parameters = ArrayList@14[empty]
+    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
 }
 
-LazyJavaClassifierType@18['J'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['J']
+LazyJavaClassifierType@17['J'] {
+    arguments = ArrayList@18[empty]
+    classifier = JavaClassImpl@19['J']
     memberScope = LazyJavaClassMemberScope@3
-    nullable = 'false': Boolean@21
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
+    nullable = 'false': Boolean@20
+    typeConstructor = LazyJavaClassTypeConstructor@13['J']
 }
 
-LazyJavaClassifierType@22['J'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@20['J']
-    nullable = 'true': Boolean@24
-    typeConstructor = LazyJavaClassTypeConstructor@14['J']
+LazyJavaClassifierType@21['J'] {
+    arguments = ArrayList@22[empty]
+    classifier = JavaClassImpl@19['J']
+    nullable = 'true': Boolean@23
+    typeConstructor = LazyJavaClassTypeConstructor@13['J']
 }
 
-LazyJavaClassifierType@25['Object'] {
-    classifier = JavaClassImpl@26['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
+LazyJavaClassifierType@24['Object'] {
+    classifier = JavaClassImpl@25['Object']
+    typeConstructor = DeserializedClassTypeConstructor@26
 }
 
-LazyJavaClassifierType@28['T'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaTypeParameterImpl@30['T']
-    nullable = 'false': Boolean@21
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
+LazyJavaClassifierType@27['T'] {
+    arguments = ArrayList@28[empty]
+    classifier = JavaTypeParameterImpl@29['T']
+    nullable = 'false': Boolean@20
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
 }
 
-LazyJavaClassifierType@32['T'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaTypeParameterImpl@30['T']
-    nullable = 'true': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
+LazyJavaClassifierType@31['T'] {
+    arguments = ArrayList@32[empty]
+    classifier = JavaTypeParameterImpl@29['T']
+    nullable = 'true': Boolean@23
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
 }
 
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
-    packageFragments('J': FqName@37) = null
-    packageFragments('String': FqName@38) = null
-    packageFragments('java': FqName@39) = LazyJavaPackageFragment@40['java']
-    packageFragments('java.lang': FqName@41) = LazyJavaPackageFragment@42['lang']
-    packageFragments('java.lang.J': FqName@43) = null
-    packageFragments('java.lang.String': FqName@44) = null
-    packageFragments('kotlin': FqName@45) = null
-    packageFragments('kotlin.J': FqName@46) = null
-    packageFragments('kotlin.String': FqName@47) = null
-    packageFragments('kotlin.io': FqName@48) = null
-    packageFragments('kotlin.jvm': FqName@49) = null
-    packageFragments('p': FqName@50) = LazyJavaPackageFragment@51['p']
-    packageFragments('p.J': FqName@52) = null
-    packageFragments('p.String': FqName@53) = null
-    topLevelClasses(JavaClassImpl@54['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@33 {
+    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
+    packageFragments('J': FqName@36) = null
+    packageFragments('String': FqName@37) = null
+    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
+    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
+    packageFragments('java.lang.J': FqName@42) = null
+    packageFragments('java.lang.String': FqName@43) = null
+    packageFragments('kotlin': FqName@44) = null
+    packageFragments('kotlin.J': FqName@45) = null
+    packageFragments('kotlin.String': FqName@46) = null
+    packageFragments('kotlin.io': FqName@47) = null
+    packageFragments('kotlin.jvm': FqName@48) = null
+    packageFragments('p': FqName@49) = LazyJavaPackageFragment@50['p']
+    packageFragments('p.J': FqName@51) = null
+    packageFragments('p.String': FqName@52) = null
+    topLevelClasses(JavaClassImpl@53['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@36['<root>'] {
-    classes('J': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('j': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('p': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('foo': Name@4) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('j': Name@7) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('p': Name@60) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@56
+LazyJavaPackageFragment@35['<root>'] {
+    classes('J': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('p': Name@59) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
-LazyJavaPackageFragment@40['java'] {
+LazyJavaPackageFragment@39['java'] {
     classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('lang': Name@64) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('lang': Name@64) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@63
     memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
-LazyJavaPackageFragment@42['lang'] {
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('j': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('foo': Name@4) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('j': Name@7) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
+LazyJavaPackageFragment@50['p'] {
+    classes('J': Name@54) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
-LazyJavaPackageFragment@51['p'] {
-    classes('J': Name@55) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('String': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('j': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('foo': Name@4) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('j': Name@7) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+LazyJavaTypeParameterDescriptor@67['T'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
+    upperBounds = LinkedHashSet@68[1] { NullableType@69 }
 }
 
-LazyJavaTypeParameterDescriptor@70['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
-    upperBounds = LinkedHashSet@71[1] { NullableType@72 }
+LazyJavaTypeParameterResolver@70 {
+    resolve(JavaTypeParameterImpl@71['T']) = LazyJavaTypeParameterDescriptor@67['T']
 }
 
-LazyJavaTypeParameterResolver@73 {
-    resolve(JavaTypeParameterImpl@74['T']) = LazyJavaTypeParameterDescriptor@70['T']
+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[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> = 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 }
+}
+
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
index 922774de994..27b5c89de32 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/elvis.lazy.log
@@ -5,79 +5,85 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
     nestedClasses('s': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('s': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['J']
 }
 
-LazyJavaClassTypeConstructor@11['J'] {
-    parameters = ArrayList@12[empty]
-    supertypes = ArrayList@13[1] { JetTypeImpl@14['Any'] }
+LazyJavaClassTypeConstructor@10['J'] {
+    parameters = ArrayList@11[empty]
+    supertypes = ArrayList@12[1] { JetTypeImpl@13['Any'] }
 }
 
-LazyJavaClassifierType@15['Object'] {
-    classifier = JavaClassImpl@16['Object']
-    typeConstructor = DeserializedClassTypeConstructor@17
+LazyJavaClassifierType@14['Object'] {
+    classifier = JavaClassImpl@15['Object']
+    typeConstructor = DeserializedClassTypeConstructor@16
 }
 
-LazyJavaClassifierType@18['String'] {
-    arguments = ArrayList@19[empty]
-    classifier = JavaClassImpl@20['String']
-    memberScope = DeserializedClassMemberScope@21
-    nullable = 'false': Boolean@22
-    typeConstructor = DeserializedClassTypeConstructor@23
+LazyJavaClassifierType@17['String'] {
+    arguments = ArrayList@18[empty]
+    classifier = JavaClassImpl@19['String']
+    memberScope = DeserializedClassMemberScope@20
+    nullable = 'false': Boolean@21
+    typeConstructor = DeserializedClassTypeConstructor@22
 }
 
-LazyJavaClassifierType@24['String'] {
-    arguments = ArrayList@25[empty]
-    classifier = JavaClassImpl@20['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@23
+LazyJavaClassifierType@23['String'] {
+    arguments = ArrayList@24[empty]
+    classifier = JavaClassImpl@19['String']
+    nullable = 'true': Boolean@25
+    typeConstructor = DeserializedClassTypeConstructor@22
 }
 
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('J': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.J': FqName@35) = null
-    packageFragments('kotlin': FqName@36) = null
-    packageFragments('kotlin.J': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-    packageFragments('p': FqName@40) = LazyJavaPackageFragment@41['p']
-    packageFragments('p.J': FqName@42) = null
-    topLevelClasses(JavaClassImpl@43['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@26 {
+    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
+    packageFragments('J': FqName@29) = null
+    packageFragments('java': FqName@30) = LazyJavaPackageFragment@31['java']
+    packageFragments('java.lang': FqName@32) = LazyJavaPackageFragment@33['lang']
+    packageFragments('java.lang.J': FqName@34) = null
+    packageFragments('kotlin': FqName@35) = null
+    packageFragments('kotlin.J': FqName@36) = null
+    packageFragments('kotlin.io': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = null
+    packageFragments('p': FqName@39) = LazyJavaPackageFragment@40['p']
+    packageFragments('p.J': FqName@41) = null
+    topLevelClasses(JavaClassImpl@42['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@29['<root>'] {
-    classes('J': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('s': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@48) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('s': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@45
+LazyJavaPackageFragment@28['<root>'] {
+    classes('J': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('p': Name@47) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@31['java'] {
     classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('lang': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
-LazyJavaPackageFragment@34['lang'] {
-    classes('s': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('s': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
+LazyJavaPackageFragment@40['p'] {
+    classes('J': Name@43) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
-LazyJavaPackageFragment@41['p'] {
-    classes('J': Name@44) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('s': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('s': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
+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 }
+}
+
+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/platformTypes/explicitFlexibleNoPackage.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
index b4272627368..525a19ec2f0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleNoPackage.lazy.log
@@ -63,3 +63,46 @@ LazyJavaPackageFragment@13['lang'] {
     functions('checkType': Name@40) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
     memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@53
 }
+
+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]
+    <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@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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
index 40bb95cd0dc..9c518c49071 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/explicitFlexibleWithPackage.lazy.log
@@ -53,3 +53,46 @@ LazyJavaPackageFragment@13['lang'] {
     functions('checkType': Name@47) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
 }
+
+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]
+    <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@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> = ArrayList@75[1] { ResolutionCandidate@76 }
+    <name not found> = ArrayList@77[1] { ResolutionCandidate@76 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
index d105ddabd0b..f0e7209909f 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/getParentOfType.lazy.log
@@ -224,21 +224,21 @@ LazyJavaClassifierType@101['T'] {
 
 LazyJavaClassifierType@104['T'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaTypeParameterImpl@103['T']
+    classifier = JavaTypeParameterImpl@100['T']
     nullable = 'true': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@106['T'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@96['T']
+    classifier = JavaTypeParameterImpl@103['T']
     nullable = 'true': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
 
 LazyJavaClassifierType@108['T'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@100['T']
+    classifier = JavaTypeParameterImpl@96['T']
     nullable = 'true': Boolean@58
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@97
 }
@@ -332,9 +332,82 @@ LazyJavaTypeParameterDescriptor@32['T'] {
 }
 
 LazyJavaTypeParameterResolver@169 {
-    resolve(JavaTypeParameterImpl@170['T']) = LazyJavaTypeParameterDescriptor@163['T']
+    resolve(JavaTypeParameterImpl@170['T']) = LazyJavaTypeParameterDescriptor@32['T']
 }
 
 LazyJavaTypeParameterResolver@171 {
-    resolve(JavaTypeParameterImpl@172['T']) = LazyJavaTypeParameterDescriptor@32['T']
+    resolve(JavaTypeParameterImpl@172['T']) = LazyJavaTypeParameterDescriptor@163['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]
+    <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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+}
+
+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> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@202 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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/platformTypes/inference.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
index 067bb81ac51..b9c1c39d5c2 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/inference.lazy.log
@@ -71,21 +71,21 @@ LazyJavaClassifierType@43['String'] {
 
 LazyJavaClassifierType@46['String'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@45['String']
+    classifier = JavaClassImpl@38['String']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@39
 }
 
 LazyJavaClassifierType@49['String'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@38['String']
+    classifier = JavaClassImpl@42['String']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@39
 }
 
 LazyJavaClassifierType@51['String'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@42['String']
+    classifier = JavaClassImpl@45['String']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@39
 }
@@ -127,21 +127,21 @@ LazyJavaClassifierType@66['Throwable'] {
 
 LazyJavaClassifierType@69['Throwable'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaClassImpl@65['Throwable']
+    classifier = JavaClassImpl@61['Throwable']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@71['Throwable'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaClassImpl@68['Throwable']
+    classifier = JavaClassImpl@65['Throwable']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@62
 }
 
 LazyJavaClassifierType@73['Throwable'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaClassImpl@61['Throwable']
+    classifier = JavaClassImpl@68['Throwable']
     nullable = 'true': Boolean@48
     typeConstructor = DeserializedClassTypeConstructor@62
 }
@@ -257,9 +257,70 @@ LazyJavaTypeParameterDescriptor@18['T'] {
 }
 
 LazyJavaTypeParameterResolver@149 {
-    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@25['T']
+    resolve(JavaTypeParameterImpl@150['T']) = LazyJavaTypeParameterDescriptor@18['T']
 }
 
 LazyJavaTypeParameterResolver@151 {
-    resolve(JavaTypeParameterImpl@152['T']) = LazyJavaTypeParameterDescriptor@18['T']
+    resolve(JavaTypeParameterImpl@152['T']) = LazyJavaTypeParameterDescriptor@25['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]
+    <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]
+    <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]
+}
+
+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]
+    <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@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[4] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
+    <name not found> = ArrayList@182[5] { ResolutionCandidate@179, ResolutionCandidate@180, ResolutionCandidate@181, ... }
+    <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 20f8f1611c8..1b43cdb4d3a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/intVsIntegerAmbiguity.lazy.log
@@ -173,3 +173,147 @@ LazyJavaPackageFragment@81['p'] {
     functions('foo': Name@7) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@97
 }
+
+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]
+    <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@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[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]
+    <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]
+    <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]
+    <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 }
+    <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@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]
+    <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@160 {
+    <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@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]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+}
+
+ResolutionTaskHolder@162 {
+    <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 45759d07209..4aa637fe6f3 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/entrySet.lazy.log
@@ -7,207 +7,248 @@ LazyJavaClassDescriptor@0['MultiMap'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('entrySet': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('entrySet': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['MultiMap']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['MultiMap']
 }
 
-LazyJavaClassTypeConstructor@13['MultiMap'] {
-    parameters = ArrayList@14[2] { LazyJavaTypeParameterDescriptor@15['K'], LazyJavaTypeParameterDescriptor@16['V'] }
-    supertypes = ArrayList@17[1] { JetTypeImpl@18['Any'] }
+LazyJavaClassTypeConstructor@12['MultiMap'] {
+    parameters = ArrayList@13[2] { LazyJavaTypeParameterDescriptor@14['K'], LazyJavaTypeParameterDescriptor@15['V'] }
+    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
 }
 
-LazyJavaClassifierType@19['Collection<V>'] {
-    arguments = ArrayList@20[1] { TypeProjectionImpl@21 }
-    classifier = JavaClassImpl@22['Collection']
-    memberScope = SubstitutingScope@23
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@18['Collection<V>'] {
+    arguments = ArrayList@19[1] { TypeProjectionImpl@20 }
+    classifier = JavaClassImpl@21['Collection']
+    memberScope = SubstitutingScope@22
+    nullable = 'false': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaClassifierType@26['Collection<V>'] {
-    arguments = ArrayList@27[1] { TypeProjectionImpl@28 }
-    classifier = JavaClassImpl@29['Collection']
-    memberScope = SubstitutingScope@30
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@25['Collection<V>'] {
+    arguments = ArrayList@26[1] { TypeProjectionImpl@27 }
+    classifier = JavaClassImpl@28['Collection']
+    memberScope = SubstitutingScope@29
+    nullable = 'false': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaClassifierType@31['Collection<V>'] {
-    arguments = ArrayList@32[1] { TypeProjectionImpl@33 }
-    classifier = JavaClassImpl@29['Collection']
-    memberScope = SubstitutingScope@34
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@36
+LazyJavaClassifierType@30['Collection<V>'] {
+    arguments = ArrayList@31[1] { TypeProjectionImpl@32 }
+    classifier = JavaClassImpl@28['Collection']
+    memberScope = SubstitutingScope@33
+    nullable = 'true': Boolean@34
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
-LazyJavaClassifierType@37['Collection<V>'] {
-    arguments = ArrayList@38[1] { TypeProjectionImpl@39 }
-    classifier = JavaClassImpl@22['Collection']
-    memberScope = SubstitutingScope@40
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@36
+LazyJavaClassifierType@36['Collection<V>'] {
+    arguments = ArrayList@37[1] { TypeProjectionImpl@38 }
+    classifier = JavaClassImpl@21['Collection']
+    memberScope = SubstitutingScope@39
+    nullable = 'true': Boolean@34
+    typeConstructor = DeserializedClassTypeConstructor@35
 }
 
-LazyJavaClassifierType@41['Object'] {
-    classifier = JavaClassImpl@42['Object']
-    typeConstructor = DeserializedClassTypeConstructor@43
+LazyJavaClassifierType@40['Object'] {
+    classifier = JavaClassImpl@41['Object']
+    typeConstructor = DeserializedClassTypeConstructor@42
 }
 
-LazyJavaClassifierType@44['Set<Collection<V>>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['Set']
-    memberScope = SubstitutingScope@48
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@49
+LazyJavaClassifierType@43['Set<Collection<V>>'] {
+    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
+    classifier = JavaClassImpl@46['Set']
+    memberScope = SubstitutingScope@47
+    nullable = 'false': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@48
 }
 
-LazyJavaClassifierType@50['Set<Collection<V>>'] {
-    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
-    classifier = JavaClassImpl@47['Set']
-    memberScope = SubstitutingScope@53
-    nullable = 'true': Boolean@35
-    typeConstructor = DeserializedClassTypeConstructor@54
+LazyJavaClassifierType@49['Set<Collection<V>>'] {
+    arguments = ArrayList@50[1] { TypeProjectionImpl@51 }
+    classifier = JavaClassImpl@46['Set']
+    memberScope = SubstitutingScope@52
+    nullable = 'true': Boolean@34
+    typeConstructor = DeserializedClassTypeConstructor@53
 }
 
-LazyJavaClassifierType@55['V'] {
-    arguments = ArrayList@56[empty]
-    classifier = JavaTypeParameterImpl@57['V']
-    nullable = 'false': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@54['V'] {
+    arguments = ArrayList@55[empty]
+    classifier = JavaTypeParameterImpl@56['V']
+    nullable = 'false': Boolean@23
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@59['V'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['V']
-    nullable = 'false': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@58['V'] {
+    arguments = ArrayList@59[empty]
+    classifier = JavaTypeParameterImpl@60['V']
+    nullable = 'false': Boolean@23
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@62['V'] {
-    arguments = ArrayList@63[empty]
-    classifier = JavaTypeParameterImpl@64['V']
-    nullable = 'false': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@61['V'] {
+    arguments = ArrayList@62[empty]
+    classifier = JavaTypeParameterImpl@63['V']
+    nullable = 'false': Boolean@23
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@65['V'] {
-    arguments = ArrayList@66[empty]
-    classifier = JavaTypeParameterImpl@67['V']
-    nullable = 'false': Boolean@24
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@64['V'] {
+    arguments = ArrayList@65[empty]
+    classifier = JavaTypeParameterImpl@66['V']
+    nullable = 'false': Boolean@23
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@68['V'] {
-    arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@57['V']
-    nullable = 'true': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@67['V'] {
+    arguments = ArrayList@68[empty]
+    classifier = JavaTypeParameterImpl@63['V']
+    nullable = 'true': Boolean@34
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@70['V'] {
-    arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@67['V']
-    nullable = 'true': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@69['V'] {
+    arguments = ArrayList@70[empty]
+    classifier = JavaTypeParameterImpl@66['V']
+    nullable = 'true': Boolean@34
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@72['V'] {
-    arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@61['V']
-    nullable = 'true': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@71['V'] {
+    arguments = ArrayList@72[empty]
+    classifier = JavaTypeParameterImpl@60['V']
+    nullable = 'true': Boolean@34
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@74['V'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@64['V']
-    nullable = 'true': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+LazyJavaClassifierType@73['V'] {
+    arguments = ArrayList@74[empty]
+    classifier = JavaTypeParameterImpl@56['V']
+    nullable = 'true': Boolean@34
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaPackageFragmentProvider@76 {
-    packageFragments('<root>': FqName@77) = LazyJavaPackageFragment@78['<root>']
-    packageFragments('Int': FqName@79) = null
-    packageFragments('String': FqName@80) = null
-    packageFragments('java': FqName@81) = LazyJavaPackageFragment@82['java']
-    packageFragments('java.lang': FqName@83) = LazyJavaPackageFragment@84['lang']
-    packageFragments('java.lang.Int': FqName@85) = null
-    packageFragments('java.lang.String': FqName@86) = null
-    packageFragments('kotlin': FqName@87) = null
-    packageFragments('kotlin.Int': FqName@88) = null
-    packageFragments('kotlin.String': FqName@89) = null
-    packageFragments('kotlin.io': FqName@90) = null
-    packageFragments('kotlin.jvm': FqName@91) = null
-    packageFragments('p': FqName@92) = LazyJavaPackageFragment@93['p']
-    packageFragments('p.Int': FqName@94) = null
-    packageFragments('p.String': FqName@95) = null
-    topLevelClasses(JavaClassImpl@96['MultiMap']) = LazyJavaClassDescriptor@0['MultiMap']
+LazyJavaPackageFragmentProvider@75 {
+    packageFragments('<root>': FqName@76) = LazyJavaPackageFragment@77['<root>']
+    packageFragments('Int': FqName@78) = null
+    packageFragments('String': FqName@79) = null
+    packageFragments('java': FqName@80) = LazyJavaPackageFragment@81['java']
+    packageFragments('java.lang': FqName@82) = LazyJavaPackageFragment@83['lang']
+    packageFragments('java.lang.Int': FqName@84) = null
+    packageFragments('java.lang.String': FqName@85) = null
+    packageFragments('kotlin': FqName@86) = null
+    packageFragments('kotlin.Int': FqName@87) = null
+    packageFragments('kotlin.String': FqName@88) = null
+    packageFragments('kotlin.io': FqName@89) = null
+    packageFragments('kotlin.jvm': FqName@90) = null
+    packageFragments('p': FqName@91) = LazyJavaPackageFragment@92['p']
+    packageFragments('p.Int': FqName@93) = null
+    packageFragments('p.String': FqName@94) = null
+    topLevelClasses(JavaClassImpl@95['MultiMap']) = LazyJavaClassDescriptor@0['MultiMap']
 }
 
-LazyJavaPackageFragment@78['<root>'] {
-    classes('Int': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('MultiMap': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('String': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('entrySet': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('iterator': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    classes('p': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@98
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('MultiMap': Name@99) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('entrySet': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('iterator': Name@101) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    functions('p': Name@104) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@98
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@98
+LazyJavaPackageFragment@77['<root>'] {
+    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('MultiMap': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('String': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('p': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('MultiMap': Name@98) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('p': Name@103) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@97
 }
 
-LazyJavaPackageFragment@82['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+LazyJavaPackageFragment@81['java'] {
+    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('lang': Name@107) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
-LazyJavaPackageFragment@84['lang'] {
-    classes('MultiMap': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('entrySet': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('iterator': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('MultiMap': Name@99) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('entrySet': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('iterator': Name@101) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+LazyJavaPackageFragment@83['lang'] {
+    classes('MultiMap': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@109
+    functions('MultiMap': Name@98) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@109
+    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
 }
 
-LazyJavaPackageFragment@93['p'] {
-    classes('Int': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('MultiMap': Name@99) = LazyJavaClassDescriptor@0['MultiMap'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('String': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('entrySet': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('iterator': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('MultiMap': Name@99) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('entrySet': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('iterator': Name@101) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@112
+LazyJavaPackageFragment@92['p'] {
+    classes('Int': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('MultiMap': Name@98) = LazyJavaClassDescriptor@0['MultiMap'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('String': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = Empty@101 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('MultiMap': Name@98) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@111
 }
 
-LazyJavaTypeParameterDescriptor@15['K'] {
-    defaultType = JetTypeImpl@114['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-    upperBounds = LinkedHashSet@116[1] { NullableType@117 }
+LazyJavaTypeParameterDescriptor@14['K'] {
+    defaultType = JetTypeImpl@113['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    upperBounds = LinkedHashSet@115[1] { NullableType@116 }
 }
 
-LazyJavaTypeParameterDescriptor@16['V'] {
-    defaultType = JetTypeImpl@118['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-    upperBounds = LinkedHashSet@119[1] { NullableType@120 }
+LazyJavaTypeParameterDescriptor@15['V'] {
+    defaultType = JetTypeImpl@117['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    upperBounds = LinkedHashSet@118[1] { NullableType@119 }
 }
 
-LazyJavaTypeParameterResolver@121 {
-    resolve(JavaTypeParameterImpl@122['K']) = LazyJavaTypeParameterDescriptor@15['K']
-    resolve(JavaTypeParameterImpl@123['V']) = LazyJavaTypeParameterDescriptor@16['V']
+LazyJavaTypeParameterResolver@120 {
+    resolve(JavaTypeParameterImpl@121['K']) = LazyJavaTypeParameterDescriptor@14['K']
+    resolve(JavaTypeParameterImpl@122['V']) = LazyJavaTypeParameterDescriptor@15['V']
 }
 
-LazyJavaTypeParameterResolver@124 {
-    resolve(JavaTypeParameterImpl@64['V']) = null
+LazyJavaTypeParameterResolver@123 {
+    resolve(JavaTypeParameterImpl@66['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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
index 3fcface0758..947304eee89 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/genericsAndArrays.lazy.log
@@ -5,26 +5,25 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
     nestedClasses('foo': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('foo': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['J']
 }
 
-LazyJavaClassDescriptor@12['Ref'] {
-    enumEntryIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@14
+LazyJavaClassDescriptor@11['Ref'] {
+    enumEntryIndex = LinkedHashMap@12 // through LazyJavaClassMemberScope@13
     functionTypeForSamInterface = null
-    functions('create': Name@15) = ArrayList@16[1] { JavaMethodDescriptor@17['create'] } // through LazyJavaStaticClassScope@18
-    functions('create': Name@15) = EmptyList@9[empty] // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@14
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaStaticClassScope@18
-    nestedClassIndex = LinkedHashMap@21 // through LazyJavaClassMemberScope@14
-    nestedClasses('create': Name@15) = null // through LazyJavaClassMemberScope@14
-    properties('create': Name@15) = EmptyList@9[empty] // through LazyJavaClassMemberScope@14
-    properties('create': Name@15) = EmptyList@9[empty] // through LazyJavaStaticClassScope@18
+    functions('create': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['create'] } // through LazyJavaStaticClassScope@17
+    functions('create': Name@14) = EmptyList@18[empty] // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaStaticClassScope@17
+    nestedClassIndex = LinkedHashMap@21 // through LazyJavaClassMemberScope@13
+    nestedClasses('create': Name@14) = null // through LazyJavaClassMemberScope@13
+    properties('create': Name@14) = EmptyList@18[empty] // through LazyJavaClassMemberScope@13
+    properties('create': Name@14) = EmptyList@18[empty] // through LazyJavaStaticClassScope@17
     typeConstructor = LazyJavaClassTypeConstructor@22['Ref']
 }
 
-LazyJavaClassTypeConstructor@11['J'] {
+LazyJavaClassTypeConstructor@10['J'] {
     parameters = ArrayList@23[1] { LazyJavaTypeParameterDescriptor@24['T'] }
     supertypes = ArrayList@25[1] { JetTypeImpl@26['Any'] }
 }
@@ -106,23 +105,23 @@ LazyJavaClassifierType@66['T'] {
 
 LazyJavaClassifierType@69['T'] {
     arguments = ArrayList@70[empty]
-    classifier = JavaTypeParameterImpl@65['T']
+    classifier = JavaTypeParameterImpl@57['T']
     nullable = 'true': Boolean@45
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
 LazyJavaClassifierType@71['T'] {
     arguments = ArrayList@72[empty]
-    classifier = JavaTypeParameterImpl@57['T']
+    classifier = JavaTypeParameterImpl@61['T']
     nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
 LazyJavaClassifierType@73['T'] {
     arguments = ArrayList@74[empty]
-    classifier = JavaTypeParameterImpl@61['T']
+    classifier = JavaTypeParameterImpl@65['T']
     nullable = 'true': Boolean@45
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
 LazyJavaClassifierType@75['T'] {
@@ -157,7 +156,7 @@ LazyJavaPackageFragmentProvider@77 {
     packageFragments('p.Ref': FqName@103) = null
     packageFragments('p.String': FqName@104) = null
     topLevelClasses(JavaClassImpl@105['J']) = LazyJavaClassDescriptor@0['J']
-    topLevelClasses(JavaClassImpl@106['Ref']) = LazyJavaClassDescriptor@12['Ref']
+    topLevelClasses(JavaClassImpl@106['Ref']) = LazyJavaClassDescriptor@11['Ref']
 }
 
 LazyJavaPackageFragment@79['<root>'] {
@@ -165,52 +164,48 @@ LazyJavaPackageFragment@79['<root>'] {
     classes('J': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@108
     classes('Ref': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@108
     classes('String': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@108
     classes('p': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@108
     deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('p': Name@114) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('p': Name@114) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@108
     memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@108
 }
 
 LazyJavaPackageFragment@85['java'] {
     classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
     deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('lang': Name@118) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('lang': Name@118) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@117
     memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@117
 }
 
 LazyJavaPackageFragment@87['lang'] {
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@120
     deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('foo': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
 }
 
 LazyJavaPackageFragment@100['p'] {
-    classes('Array': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('J': Name@109) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Ref': Name@110) = LazyJavaClassDescriptor@12['Ref'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('String': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('Array': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('J': Name@109) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Ref': Name@110) = LazyJavaClassDescriptor@11['Ref'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('String': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaTypeParameterDescriptor@24['T'] {
-    defaultType = JetTypeImpl@124['T']
+    defaultType = JetTypeImpl@122['T']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
-    upperBounds = LinkedHashSet@125[1] { NullableType@126 }
+    upperBounds = LinkedHashSet@123[1] { NullableType@124 }
 }
 
-LazyJavaTypeParameterDescriptor@127['T'] {
+LazyJavaTypeParameterDescriptor@125['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
-    upperBounds = LinkedHashSet@128[1] { NullableType@129 }
+    upperBounds = LinkedHashSet@126[1] { NullableType@127 }
 }
 
 LazyJavaTypeParameterDescriptor@28['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@128
+}
+
+LazyJavaTypeParameterResolver@129 {
+    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@24['T']
 }
 
 LazyJavaTypeParameterResolver@131 {
@@ -218,13 +213,46 @@ LazyJavaTypeParameterResolver@131 {
 }
 
 LazyJavaTypeParameterResolver@133 {
-    resolve(JavaTypeParameterImpl@134['T']) = LazyJavaTypeParameterDescriptor@127['T']
+    resolve(JavaTypeParameterImpl@134['T']) = LazyJavaTypeParameterDescriptor@125['T']
 }
 
 LazyJavaTypeParameterResolver@135 {
-    resolve(JavaTypeParameterImpl@136['T']) = LazyJavaTypeParameterDescriptor@24['T']
+    resolve(JavaTypeParameterImpl@57['T']) = null
 }
 
-LazyJavaTypeParameterResolver@137 {
-    resolve(JavaTypeParameterImpl@65['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@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> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 9b7a1e48da5..5496389b966 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/int.lazy.log
@@ -7,64 +7,120 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('_int': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('_int': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+    properties('_int': Name@11) = EmptyList@12[empty] // through LazyJavaClassMemberScope@3
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@14['J']
 }
 
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@14['J'] {
+    parameters = ArrayList@15[empty]
+    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
 }
 
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
+LazyJavaClassifierType@18['Object'] {
+    classifier = JavaClassImpl@19['Object']
+    typeConstructor = DeserializedClassTypeConstructor@20
 }
 
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
-    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
-    packageFragments('kotlin': FqName@27) = null
-    packageFragments('kotlin.io': FqName@28) = null
-    packageFragments('kotlin.jvm': FqName@29) = null
-    packageFragments('p': FqName@30) = LazyJavaPackageFragment@31['p']
-    topLevelClasses(JavaClassImpl@32['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@21 {
+    packageFragments('<root>': FqName@22) = LazyJavaPackageFragment@23['<root>']
+    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
+    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
+    packageFragments('kotlin': FqName@28) = null
+    packageFragments('kotlin.io': FqName@29) = null
+    packageFragments('kotlin.jvm': FqName@30) = null
+    packageFragments('p': FqName@31) = LazyJavaPackageFragment@32['p']
+    topLevelClasses(JavaClassImpl@33['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@22['<root>'] {
-    classes('J': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('_int': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    classes('p': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('J': Name@33) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('_int': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('p': Name@37) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
+LazyJavaPackageFragment@23['<root>'] {
+    classes('J': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('_int': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('p': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('J': Name@34) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('_int': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('p': Name@38) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
-LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+LazyJavaPackageFragment@25['java'] {
+    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('lang': Name@42) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
-LazyJavaPackageFragment@26['lang'] {
-    classes('J': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('_int': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('J': Name@33) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('_int': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+LazyJavaPackageFragment@27['lang'] {
+    classes('J': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('_int': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('J': Name@34) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('_int': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
-LazyJavaPackageFragment@31['p'] {
-    classes('J': Name@33) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('_int': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('J': Name@33) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('_int': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+LazyJavaPackageFragment@32['p'] {
+    classes('J': Name@34) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('_int': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('J': Name@34) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    functions('_int': Name@11) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@46
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@46
+}
+
+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]
+    <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@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]
+    <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]
+    <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 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
index 95313fc4627..49cf567187d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/intArray.lazy.log
@@ -7,70 +7,96 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('intArr': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('intArr': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['J'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
+LazyJavaClassifierType@16['Object'] {
+    classifier = JavaClassImpl@17['Object']
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
-LazyJavaPackageFragmentProvider@20 {
-    packageFragments('<root>': FqName@21) = LazyJavaPackageFragment@22['<root>']
-    packageFragments('IntArray': FqName@23) = null
-    packageFragments('java': FqName@24) = LazyJavaPackageFragment@25['java']
-    packageFragments('java.lang': FqName@26) = LazyJavaPackageFragment@27['lang']
-    packageFragments('java.lang.IntArray': FqName@28) = null
-    packageFragments('kotlin': FqName@29) = null
-    packageFragments('kotlin.IntArray': FqName@30) = null
-    packageFragments('kotlin.io': FqName@31) = null
-    packageFragments('kotlin.jvm': FqName@32) = null
-    packageFragments('p': FqName@33) = LazyJavaPackageFragment@34['p']
-    packageFragments('p.IntArray': FqName@35) = null
-    topLevelClasses(JavaClassImpl@36['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@19 {
+    packageFragments('<root>': FqName@20) = LazyJavaPackageFragment@21['<root>']
+    packageFragments('IntArray': FqName@22) = null
+    packageFragments('java': FqName@23) = LazyJavaPackageFragment@24['java']
+    packageFragments('java.lang': FqName@25) = LazyJavaPackageFragment@26['lang']
+    packageFragments('java.lang.IntArray': FqName@27) = null
+    packageFragments('kotlin': FqName@28) = null
+    packageFragments('kotlin.IntArray': FqName@29) = null
+    packageFragments('kotlin.io': FqName@30) = null
+    packageFragments('kotlin.jvm': FqName@31) = null
+    packageFragments('p': FqName@32) = LazyJavaPackageFragment@33['p']
+    packageFragments('p.IntArray': FqName@34) = null
+    topLevelClasses(JavaClassImpl@35['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@22['<root>'] {
-    classes('IntArray': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('J': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('intArr': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('p': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('J': Name@39) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('intArr': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('p': Name@42) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@38
+LazyJavaPackageFragment@21['<root>'] {
+    classes('IntArray': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('J': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('p': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('J': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('p': Name@42) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@37
 }
 
-LazyJavaPackageFragment@25['java'] {
+LazyJavaPackageFragment@24['java'] {
     classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('lang': Name@46) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@27['lang'] {
-    classes('J': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('intArr': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('J': Name@39) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('intArr': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@48
+LazyJavaPackageFragment@26['lang'] {
+    classes('J': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@48
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@48
+    functions('J': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@48
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
 }
 
-LazyJavaPackageFragment@34['p'] {
-    classes('IntArray': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('J': Name@39) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('intArr': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@41 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('J': Name@39) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('intArr': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+LazyJavaPackageFragment@33['p'] {
+    classes('IntArray': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    classes('J': Name@38) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('J': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
 }
+
+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]
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
index e5bbb1888dd..f7f01c35f8c 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaCollectionToKotlin.lazy.log
@@ -56,40 +56,40 @@ LazyJavaClassifierType@40['K'] {
     arguments = ArrayList@41[empty]
     classifier = JavaTypeParameterImpl@42['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    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@42['K']
-    nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-}
-
-LazyJavaClassifierType@50['K'] {
-    arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@39['K']
+    classifier = JavaTypeParameterImpl@34['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
+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@46['K']
+    classifier = JavaTypeParameterImpl@42['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@34['K']
+    classifier = JavaTypeParameterImpl@39['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
@@ -166,28 +166,28 @@ LazyJavaClassifierType@92['V'] {
 
 LazyJavaClassifierType@95['V'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@90['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@87['V']
+    classifier = JavaTypeParameterImpl@94['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@99['V'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+    classifier = JavaTypeParameterImpl@90['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@91
 }
 
 LazyJavaClassifierType@101['V'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@87['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
@@ -264,7 +264,7 @@ LazyJavaTypeParameterDescriptor@18['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@46
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
@@ -283,6 +283,24 @@ LazyJavaTypeParameterResolver@154 {
 }
 
 LazyJavaTypeParameterResolver@157 {
-    resolve(JavaTypeParameterImpl@42['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@45['K']) = LazyJavaTypeParameterDescriptor@13['K']
     resolve(JavaTypeParameterImpl@90['V']) = LazyJavaTypeParameterDescriptor@14['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, ... }
+    <name not found> = EmptyList@135[empty]
+    <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 89af0f7bbee..9fcce5c97aa 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToJava.lazy.log
@@ -20,317 +20,341 @@ LazyJavaClassDescriptor@6['J'] {
     nestedClassIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@9
     nestedClasses('list': Name@10) = null // through LazyJavaClassMemberScope@9
     nestedClasses('takeList': Name@13) = null // through LazyJavaClassMemberScope@9
-    properties('list': Name@10) = EmptyList@18[empty] // through LazyJavaClassMemberScope@9
-    properties('takeList': Name@13) = EmptyList@18[empty] // through LazyJavaClassMemberScope@9
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@19['J']
 }
 
-LazyJavaClassDescriptor@21['RandomAccess'] {
-    typeConstructor = LazyJavaClassTypeConstructor@22['RandomAccess']
+LazyJavaClassDescriptor@20['RandomAccess'] {
+    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
 }
 
-LazyJavaClassDescriptor@23['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
+LazyJavaClassDescriptor@22['Serializable'] {
+    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
 }
 
 LazyJavaClassTypeConstructor@1['AbstractCollection'] {
-    parameters = ArrayList@25[1] { LazyJavaTypeParameterDescriptor@26['E'] }
-    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['Collection<E>'] }
+    parameters = ArrayList@24[1] { LazyJavaTypeParameterDescriptor@25['E'] }
+    supertypes = ArrayList@26[1] { LazyJavaClassifierType@27['Collection<E>'] }
 }
 
 LazyJavaClassTypeConstructor@3['AbstractList'] {
-    parameters = ArrayList@29[1] { LazyJavaTypeParameterDescriptor@30['E'] }
-    supertypes = ArrayList@31[2] { LazyJavaClassifierType@32['AbstractCollection<E>'], LazyJavaClassifierType@33['List<E>'] }
+    parameters = ArrayList@28[1] { LazyJavaTypeParameterDescriptor@29['E'] }
+    supertypes = ArrayList@30[2] { LazyJavaClassifierType@31['AbstractCollection<E>'], LazyJavaClassifierType@32['List<E>'] }
 }
 
 LazyJavaClassTypeConstructor@5['ArrayList'] {
-    parameters = ArrayList@34[1] { LazyJavaTypeParameterDescriptor@35['E'] }
-    supertypes = ArrayList@36[5] { LazyJavaClassifierType@37['AbstractList<E>'], LazyJavaClassifierType@38['List<E>'], LazyJavaClassifierType@39['RandomAccess'], ... }
+    parameters = ArrayList@33[1] { LazyJavaTypeParameterDescriptor@34['E'] }
+    supertypes = ArrayList@35[5] { LazyJavaClassifierType@36['AbstractList<E>'], LazyJavaClassifierType@37['List<E>'], LazyJavaClassifierType@38['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@20['J'] {
-    parameters = ArrayList@40[empty]
-    supertypes = ArrayList@41[1] { JetTypeImpl@42['Any'] }
+LazyJavaClassTypeConstructor@19['J'] {
+    parameters = ArrayList@39[empty]
+    supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
 }
 
-LazyJavaClassTypeConstructor@22['RandomAccess'] {
-    supertypes = ArrayList@43[1] { JetTypeImpl@42['Any'] }
+LazyJavaClassTypeConstructor@21['RandomAccess'] {
+    supertypes = ArrayList@42[1] { JetTypeImpl@41['Any'] }
 }
 
-LazyJavaClassTypeConstructor@24['Serializable'] {
-    supertypes = ArrayList@44[1] { JetTypeImpl@42['Any'] }
+LazyJavaClassTypeConstructor@23['Serializable'] {
+    supertypes = ArrayList@43[1] { JetTypeImpl@41['Any'] }
 }
 
-LazyJavaClassifierType@32['AbstractCollection<E>'] {
-    arguments = ArrayList@45[1] { TypeProjectionImpl@46 }
-    classifier = JavaClassImpl@47['AbstractCollection']
+LazyJavaClassifierType@31['AbstractCollection<E>'] {
+    arguments = ArrayList@44[1] { TypeProjectionImpl@45 }
+    classifier = JavaClassImpl@46['AbstractCollection']
     typeConstructor = LazyJavaClassTypeConstructor@1['AbstractCollection']
 }
 
-LazyJavaClassifierType@37['AbstractList<E>'] {
-    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
-    classifier = JavaClassImpl@50['AbstractList']
+LazyJavaClassifierType@36['AbstractList<E>'] {
+    arguments = ArrayList@47[1] { TypeProjectionImpl@48 }
+    classifier = JavaClassImpl@49['AbstractList']
     typeConstructor = LazyJavaClassTypeConstructor@3['AbstractList']
 }
 
-LazyJavaClassifierType@51['ArrayList<String>'] {
-    arguments = ArrayList@52[1] { TypeProjectionImpl@53 }
-    classifier = JavaClassImpl@54['ArrayList']
-    nullable = 'false': Boolean@55
+LazyJavaClassifierType@50['ArrayList<String>'] {
+    arguments = ArrayList@51[1] { TypeProjectionImpl@52 }
+    classifier = JavaClassImpl@53['ArrayList']
+    nullable = 'false': Boolean@54
     typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
 }
 
-LazyJavaClassifierType@56['ArrayList<String>'] {
-    arguments = ArrayList@57[1] { TypeProjectionImpl@58 }
-    classifier = JavaClassImpl@59['ArrayList']
-    nullable = 'false': Boolean@55
+LazyJavaClassifierType@55['ArrayList<String>'] {
+    arguments = ArrayList@56[1] { TypeProjectionImpl@57 }
+    classifier = JavaClassImpl@58['ArrayList']
+    nullable = 'false': Boolean@54
     typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
 }
 
-LazyJavaClassifierType@60['ArrayList<String>'] {
-    arguments = ArrayList@61[1] { TypeProjectionImpl@62 }
-    classifier = JavaClassImpl@54['ArrayList']
-    nullable = 'true': Boolean@63
+LazyJavaClassifierType@59['ArrayList<String>'] {
+    arguments = ArrayList@60[1] { TypeProjectionImpl@61 }
+    classifier = JavaClassImpl@53['ArrayList']
+    nullable = 'true': Boolean@62
     typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
 }
 
-LazyJavaClassifierType@64['ArrayList<String>'] {
-    arguments = ArrayList@65[1] { TypeProjectionImpl@66 }
-    classifier = JavaClassImpl@59['ArrayList']
-    nullable = 'true': Boolean@63
+LazyJavaClassifierType@63['ArrayList<String>'] {
+    arguments = ArrayList@64[1] { TypeProjectionImpl@65 }
+    classifier = JavaClassImpl@58['ArrayList']
+    nullable = 'true': Boolean@62
     typeConstructor = LazyJavaClassTypeConstructor@5['ArrayList']
 }
 
-LazyJavaClassifierType@67['Cloneable'] {
-    classifier = JavaClassImpl@68['Cloneable']
-    typeConstructor = DeserializedClassTypeConstructor@69
+LazyJavaClassifierType@66['Cloneable'] {
+    classifier = JavaClassImpl@67['Cloneable']
+    typeConstructor = DeserializedClassTypeConstructor@68
 }
 
-LazyJavaClassifierType@28['Collection<E>'] {
-    arguments = ArrayList@70[1] { TypeProjectionImpl@71 }
-    classifier = JavaClassImpl@72['Collection']
-    typeConstructor = DeserializedClassTypeConstructor@73
+LazyJavaClassifierType@27['Collection<E>'] {
+    arguments = ArrayList@69[1] { TypeProjectionImpl@70 }
+    classifier = JavaClassImpl@71['Collection']
+    typeConstructor = DeserializedClassTypeConstructor@72
 }
 
-LazyJavaClassifierType@74['E'] {
-    arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+LazyJavaClassifierType@73['E'] {
+    arguments = ArrayList@74[empty]
+    classifier = JavaTypeParameterImpl@75['E']
+    nullable = 'false': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
-LazyJavaClassifierType@78['E'] {
-    arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@80['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@81
+LazyJavaClassifierType@77['E'] {
+    arguments = ArrayList@78[empty]
+    classifier = JavaTypeParameterImpl@79['E']
+    nullable = 'false': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
-LazyJavaClassifierType@82['E'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@84['E']
-    nullable = 'false': Boolean@55
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+LazyJavaClassifierType@81['E'] {
+    arguments = ArrayList@82[empty]
+    classifier = JavaTypeParameterImpl@83['E']
+    nullable = 'false': Boolean@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaTypeParameterImpl@80['E']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@81
+LazyJavaClassifierType@85['E'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaTypeParameterImpl@75['E']
+    nullable = 'true': Boolean@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
-LazyJavaClassifierType@88['E'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@76['E']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+LazyJavaClassifierType@87['E'] {
+    arguments = ArrayList@88[empty]
+    classifier = JavaTypeParameterImpl@79['E']
+    nullable = 'true': Boolean@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
-LazyJavaClassifierType@90['E'] {
-    arguments = ArrayList@91[empty]
-    classifier = JavaTypeParameterImpl@84['E']
-    nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+LazyJavaClassifierType@89['E'] {
+    arguments = ArrayList@90[empty]
+    classifier = JavaTypeParameterImpl@83['E']
+    nullable = 'true': Boolean@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@33['List<E>'] {
-    classifier = JavaClassImpl@92['List']
-    typeConstructor = DeserializedClassTypeConstructor@93
+LazyJavaClassifierType@32['List<E>'] {
+    classifier = JavaClassImpl@91['List']
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
-LazyJavaClassifierType@38['List<E>'] {
-    classifier = JavaClassImpl@94['List']
-    typeConstructor = DeserializedClassTypeConstructor@93
+LazyJavaClassifierType@37['List<E>'] {
+    classifier = JavaClassImpl@93['List']
+    typeConstructor = DeserializedClassTypeConstructor@92
 }
 
-LazyJavaClassifierType@95['Object'] {
-    classifier = JavaClassImpl@96['Object']
-    typeConstructor = DeserializedClassTypeConstructor@97
+LazyJavaClassifierType@94['Object'] {
+    classifier = JavaClassImpl@95['Object']
+    typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@98['Object'] {
-    classifier = JavaClassImpl@99['Object']
-    typeConstructor = DeserializedClassTypeConstructor@97
+LazyJavaClassifierType@97['Object'] {
+    classifier = JavaClassImpl@98['Object']
+    typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@100['Object'] {
-    classifier = JavaClassImpl@101['Object']
-    typeConstructor = DeserializedClassTypeConstructor@97
+LazyJavaClassifierType@99['Object'] {
+    classifier = JavaClassImpl@100['Object']
+    typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@102['Object'] {
-    classifier = JavaClassImpl@103['Object']
-    typeConstructor = DeserializedClassTypeConstructor@97
+LazyJavaClassifierType@101['Object'] {
+    classifier = JavaClassImpl@102['Object']
+    typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@39['RandomAccess'] {
-    classifier = JavaClassImpl@104['RandomAccess']
-    typeConstructor = LazyJavaClassTypeConstructor@22['RandomAccess']
+LazyJavaClassifierType@38['RandomAccess'] {
+    classifier = JavaClassImpl@103['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@21['RandomAccess']
 }
 
-LazyJavaClassifierType@105['Serializable'] {
-    classifier = JavaClassImpl@106['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@24['Serializable']
+LazyJavaClassifierType@104['Serializable'] {
+    classifier = JavaClassImpl@105['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Serializable']
 }
 
-LazyJavaClassifierType@107['String'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@106['String'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaClassImpl@108['String']
+    nullable = 'false': Boolean@54
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaClassifierType@111['String'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@113['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@110['String'] {
+    arguments = ArrayList@111[empty]
+    classifier = JavaClassImpl@112['String']
+    nullable = 'false': Boolean@54
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaClassifierType@114['String'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@116['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@113['String'] {
+    arguments = ArrayList@114[empty]
+    classifier = JavaClassImpl@115['String']
+    nullable = 'false': Boolean@54
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaClassifierType@117['String'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['String']
-    nullable = 'false': Boolean@55
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@116['String'] {
+    arguments = ArrayList@117[empty]
+    classifier = JavaClassImpl@118['String']
+    nullable = 'false': Boolean@54
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaClassifierType@120['String'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@109['String']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@119['String'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaClassImpl@112['String']
+    nullable = 'true': Boolean@62
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaClassifierType@122['String'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@116['String']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@121['String'] {
+    arguments = ArrayList@122[empty]
+    classifier = JavaClassImpl@108['String']
+    nullable = 'true': Boolean@62
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaClassifierType@124['String'] {
-    arguments = ArrayList@125[empty]
-    classifier = JavaClassImpl@113['String']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@123['String'] {
+    arguments = ArrayList@124[empty]
+    classifier = JavaClassImpl@115['String']
+    nullable = 'true': Boolean@62
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaClassifierType@126['String'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@119['String']
-    nullable = 'true': Boolean@63
-    typeConstructor = DeserializedClassTypeConstructor@110
+LazyJavaClassifierType@125['String'] {
+    arguments = ArrayList@126[empty]
+    classifier = JavaClassImpl@118['String']
+    nullable = 'true': Boolean@62
+    typeConstructor = DeserializedClassTypeConstructor@109
 }
 
-LazyJavaPackageFragmentProvider@128 {
-    packageFragments('<root>': FqName@129) = LazyJavaPackageFragment@130['<root>']
-    packageFragments('J': FqName@131) = null
-    packageFragments('java': FqName@132) = LazyJavaPackageFragment@133['java']
-    packageFragments('java.io': FqName@134) = LazyJavaPackageFragment@135['io']
-    packageFragments('java.lang': FqName@136) = LazyJavaPackageFragment@137['lang']
-    packageFragments('java.lang.J': FqName@138) = null
-    packageFragments('java.util': FqName@139) = LazyJavaPackageFragment@140['util']
-    packageFragments('kotlin': FqName@141) = null
-    packageFragments('kotlin.J': FqName@142) = null
-    packageFragments('kotlin.io': FqName@143) = null
-    packageFragments('kotlin.jvm': FqName@144) = null
-    packageFragments('p': FqName@145) = LazyJavaPackageFragment@146['p']
-    packageFragments('p.J': FqName@147) = null
-    topLevelClasses(JavaClassImpl@47['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@50['AbstractList']) = LazyJavaClassDescriptor@2['AbstractList']
-    topLevelClasses(JavaClassImpl@59['ArrayList']) = LazyJavaClassDescriptor@4['ArrayList']
-    topLevelClasses(JavaClassImpl@148['J']) = LazyJavaClassDescriptor@6['J']
-    topLevelClasses(JavaClassImpl@104['RandomAccess']) = LazyJavaClassDescriptor@21['RandomAccess']
-    topLevelClasses(JavaClassImpl@106['Serializable']) = LazyJavaClassDescriptor@23['Serializable']
+LazyJavaPackageFragmentProvider@127 {
+    packageFragments('<root>': FqName@128) = LazyJavaPackageFragment@129['<root>']
+    packageFragments('J': FqName@130) = null
+    packageFragments('java': FqName@131) = LazyJavaPackageFragment@132['java']
+    packageFragments('java.io': FqName@133) = LazyJavaPackageFragment@134['io']
+    packageFragments('java.lang': FqName@135) = LazyJavaPackageFragment@136['lang']
+    packageFragments('java.lang.J': FqName@137) = null
+    packageFragments('java.util': FqName@138) = LazyJavaPackageFragment@139['util']
+    packageFragments('kotlin': FqName@140) = null
+    packageFragments('kotlin.J': FqName@141) = null
+    packageFragments('kotlin.io': FqName@142) = null
+    packageFragments('kotlin.jvm': FqName@143) = null
+    packageFragments('p': FqName@144) = LazyJavaPackageFragment@145['p']
+    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@147['J']) = LazyJavaClassDescriptor@6['J']
+    topLevelClasses(JavaClassImpl@103['RandomAccess']) = LazyJavaClassDescriptor@20['RandomAccess']
+    topLevelClasses(JavaClassImpl@105['Serializable']) = LazyJavaClassDescriptor@22['Serializable']
 }
 
-LazyJavaPackageFragment@130['<root>'] {
-    classes('J': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('list': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('p': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('takeList': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('list': Name@10) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('p': Name@153) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('takeList': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@150
+LazyJavaPackageFragment@129['<root>'] {
+    classes('J': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('p': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('p': Name@152) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@149
 }
 
-LazyJavaPackageFragment@133['java'] {
+LazyJavaPackageFragment@132['java'] {
     classes('lang': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('lang': Name@157) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@156
+    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@156
+    functions('lang': Name@157) = EmptyList@153[empty] // through LazyPackageFragmentScopeForJavaPackage@156
     memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@156
 }
 
-LazyJavaPackageFragment@137['lang'] {
-    classes('list': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('takeList': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('list': Name@10) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('takeList': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@159
+LazyJavaPackageFragment@145['p'] {
+    classes('J': Name@148) = LazyJavaClassDescriptor@6['J'] // through LazyPackageFragmentScopeForJavaPackage@159
 }
 
-LazyJavaPackageFragment@146['p'] {
-    classes('J': Name@149) = LazyJavaClassDescriptor@6['J'] // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('list': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('takeList': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    deserializedPackageScope = Empty@152 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('list': Name@10) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('takeList': Name@13) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@161
+LazyJavaTypeParameterDescriptor@34['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaTypeParameterDescriptor@26['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@81
+LazyJavaTypeParameterDescriptor@25['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@80
 }
 
-LazyJavaTypeParameterDescriptor@35['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
+LazyJavaTypeParameterDescriptor@29['E'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@76
 }
 
-LazyJavaTypeParameterDescriptor@30['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
+LazyJavaTypeParameterResolver@160 {
+    resolve(JavaTypeParameterImpl@161['E']) = LazyJavaTypeParameterDescriptor@34['E']
+}
+
+LazyJavaTypeParameterResolver@162 {
+    resolve(JavaTypeParameterImpl@75['E']) = LazyJavaTypeParameterDescriptor@29['E']
 }
 
 LazyJavaTypeParameterResolver@163 {
-    resolve(JavaTypeParameterImpl@76['E']) = LazyJavaTypeParameterDescriptor@30['E']
+    resolve(JavaTypeParameterImpl@79['E']) = LazyJavaTypeParameterDescriptor@25['E']
 }
 
-LazyJavaTypeParameterResolver@164 {
-    resolve(JavaTypeParameterImpl@165['E']) = LazyJavaTypeParameterDescriptor@35['E']
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
 }
 
-LazyJavaTypeParameterResolver@166 {
-    resolve(JavaTypeParameterImpl@80['E']) = LazyJavaTypeParameterDescriptor@26['E']
+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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
index c36ad010520..0e4312a0ad0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/javaToKotlin.lazy.log
@@ -7,88 +7,104 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('j': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('j': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['J'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['J'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['J']
-    nullable = 'false': Boolean@20
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+LazyJavaClassifierType@16['J'] {
+    arguments = ArrayList@17[empty]
+    classifier = JavaClassImpl@18['J']
+    nullable = 'false': Boolean@19
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassifierType@21['J'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@19['J']
-    nullable = 'true': Boolean@23
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+LazyJavaClassifierType@20['J'] {
+    arguments = ArrayList@21[empty]
+    classifier = JavaClassImpl@18['J']
+    nullable = 'true': Boolean@22
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassifierType@24['Object'] {
-    classifier = JavaClassImpl@25['Object']
-    typeConstructor = DeserializedClassTypeConstructor@26
+LazyJavaClassifierType@23['Object'] {
+    classifier = JavaClassImpl@24['Object']
+    typeConstructor = DeserializedClassTypeConstructor@25
 }
 
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('J': FqName@30) = null
-    packageFragments('java': FqName@31) = LazyJavaPackageFragment@32['java']
-    packageFragments('java.lang': FqName@33) = LazyJavaPackageFragment@34['lang']
-    packageFragments('java.lang.J': FqName@35) = null
-    packageFragments('kotlin': FqName@36) = null
-    packageFragments('kotlin.J': FqName@37) = null
-    packageFragments('kotlin.io': FqName@38) = null
-    packageFragments('kotlin.jvm': FqName@39) = null
-    packageFragments('p': FqName@40) = LazyJavaPackageFragment@41['p']
-    packageFragments('p.J': FqName@42) = null
-    topLevelClasses(JavaClassImpl@43['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@26 {
+    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
+    packageFragments('J': FqName@29) = null
+    packageFragments('java': FqName@30) = LazyJavaPackageFragment@31['java']
+    packageFragments('java.lang': FqName@32) = LazyJavaPackageFragment@33['lang']
+    packageFragments('java.lang.J': FqName@34) = null
+    packageFragments('kotlin': FqName@35) = null
+    packageFragments('kotlin.J': FqName@36) = null
+    packageFragments('kotlin.io': FqName@37) = null
+    packageFragments('kotlin.jvm': FqName@38) = null
+    packageFragments('p': FqName@39) = LazyJavaPackageFragment@40['p']
+    packageFragments('p.J': FqName@41) = null
+    topLevelClasses(JavaClassImpl@42['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@29['<root>'] {
-    classes('J': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('j': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('p': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('takeJ': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('J': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('j': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('p': Name@50) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('takeJ': Name@47) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@45
+LazyJavaPackageFragment@28['<root>'] {
+    classes('J': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('p': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('takeJ': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('J': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('p': Name@50) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('takeJ': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
-LazyJavaPackageFragment@32['java'] {
+LazyJavaPackageFragment@31['java'] {
     classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('lang': Name@54) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@53
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
 }
 
-LazyJavaPackageFragment@34['lang'] {
-    classes('J': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('j': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('takeJ': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('J': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('j': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('takeJ': Name@47) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+LazyJavaPackageFragment@33['lang'] {
+    classes('J': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('takeJ': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('J': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('takeJ': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-LazyJavaPackageFragment@41['p'] {
-    classes('J': Name@44) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('j': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('takeJ': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('J': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('j': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('takeJ': Name@47) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+LazyJavaPackageFragment@40['p'] {
+    classes('J': Name@43) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('takeJ': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('J': Name@48) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('takeJ': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
 }
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/kotlinCollectionToJava.lazy.log
index e37cd9bd1fe..b7b0ea7b038 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@18['K']
+    classifier = JavaTypeParameterImpl@13['K']
     nullable = 'true': Boolean@21
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
 }
 
 LazyJavaClassifierType@22['K'] {
     arguments = ArrayList@23[empty]
-    classifier = JavaTypeParameterImpl@13['K']
+    classifier = JavaTypeParameterImpl@18['K']
     nullable = 'true': Boolean@21
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@15
 }
@@ -153,3 +153,17 @@ LazyJavaTypeParameterResolver@96 {
     resolve(JavaTypeParameterImpl@97['K']) = LazyJavaTypeParameterDescriptor@9['K']
     resolve(JavaTypeParameterImpl@98['V']) = LazyJavaTypeParameterDescriptor@10['V']
 }
+
+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]
+    <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 037fd233a92..3eae2ad3f86 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/list.lazy.log
@@ -7,124 +7,193 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('list': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('list': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['J'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['List<String>'] {
-    arguments = ArrayList@18[1] { TypeProjectionImpl@19 }
-    classifier = JavaClassImpl@20['List']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@22
+LazyJavaClassifierType@16['List<String>'] {
+    arguments = ArrayList@17[1] { TypeProjectionImpl@18 }
+    classifier = JavaClassImpl@19['List']
+    nullable = 'false': Boolean@20
+    typeConstructor = DeserializedClassTypeConstructor@21
 }
 
-LazyJavaClassifierType@23['List<String>'] {
-    arguments = ArrayList@24[1] { TypeProjectionImpl@25 }
-    classifier = JavaClassImpl@20['List']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@27
+LazyJavaClassifierType@22['List<String>'] {
+    arguments = ArrayList@23[1] { TypeProjectionImpl@24 }
+    classifier = JavaClassImpl@19['List']
+    nullable = 'true': Boolean@25
+    typeConstructor = DeserializedClassTypeConstructor@26
 }
 
-LazyJavaClassifierType@28['Object'] {
-    classifier = JavaClassImpl@29['Object']
-    typeConstructor = DeserializedClassTypeConstructor@30
+LazyJavaClassifierType@27['Object'] {
+    classifier = JavaClassImpl@28['Object']
+    typeConstructor = DeserializedClassTypeConstructor@29
 }
 
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@34
+LazyJavaClassifierType@30['String'] {
+    arguments = ArrayList@31[empty]
+    classifier = JavaClassImpl@32['String']
+    nullable = 'false': Boolean@20
+    typeConstructor = DeserializedClassTypeConstructor@33
 }
 
-LazyJavaClassifierType@35['String'] {
-    arguments = ArrayList@36[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'false': Boolean@21
-    typeConstructor = DeserializedClassTypeConstructor@34
+LazyJavaClassifierType@34['String'] {
+    arguments = ArrayList@35[empty]
+    classifier = JavaClassImpl@36['String']
+    nullable = 'false': Boolean@20
+    typeConstructor = DeserializedClassTypeConstructor@33
 }
 
-LazyJavaClassifierType@38['String'] {
-    arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
+LazyJavaClassifierType@37['String'] {
+    arguments = ArrayList@38[empty]
+    classifier = JavaClassImpl@32['String']
+    nullable = 'true': Boolean@25
+    typeConstructor = DeserializedClassTypeConstructor@33
 }
 
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@37['String']
-    nullable = 'true': Boolean@26
-    typeConstructor = DeserializedClassTypeConstructor@34
+LazyJavaClassifierType@39['String'] {
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@36['String']
+    nullable = 'true': Boolean@25
+    typeConstructor = DeserializedClassTypeConstructor@33
 }
 
-LazyJavaPackageFragmentProvider@42 {
-    packageFragments('<root>': FqName@43) = LazyJavaPackageFragment@44['<root>']
-    packageFragments('List': FqName@45) = null
-    packageFragments('MutableList': FqName@46) = null
-    packageFragments('String': FqName@47) = null
-    packageFragments('java': FqName@48) = LazyJavaPackageFragment@49['java']
-    packageFragments('java.lang': FqName@50) = LazyJavaPackageFragment@51['lang']
-    packageFragments('java.lang.List': FqName@52) = null
-    packageFragments('java.lang.MutableList': FqName@53) = null
-    packageFragments('java.lang.String': FqName@54) = null
-    packageFragments('kotlin': FqName@55) = null
-    packageFragments('kotlin.List': FqName@56) = null
-    packageFragments('kotlin.MutableList': FqName@57) = null
-    packageFragments('kotlin.String': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = null
-    packageFragments('kotlin.jvm': FqName@60) = null
-    packageFragments('p': FqName@61) = LazyJavaPackageFragment@62['p']
-    packageFragments('p.List': FqName@63) = null
-    packageFragments('p.MutableList': FqName@64) = null
-    packageFragments('p.String': FqName@65) = null
-    topLevelClasses(JavaClassImpl@66['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@41 {
+    packageFragments('<root>': FqName@42) = LazyJavaPackageFragment@43['<root>']
+    packageFragments('List': FqName@44) = null
+    packageFragments('MutableList': FqName@45) = null
+    packageFragments('String': FqName@46) = null
+    packageFragments('java': FqName@47) = LazyJavaPackageFragment@48['java']
+    packageFragments('java.lang': FqName@49) = LazyJavaPackageFragment@50['lang']
+    packageFragments('java.lang.List': FqName@51) = null
+    packageFragments('java.lang.MutableList': FqName@52) = null
+    packageFragments('java.lang.String': FqName@53) = null
+    packageFragments('kotlin': FqName@54) = null
+    packageFragments('kotlin.List': FqName@55) = null
+    packageFragments('kotlin.MutableList': FqName@56) = null
+    packageFragments('kotlin.String': FqName@57) = null
+    packageFragments('kotlin.io': FqName@58) = null
+    packageFragments('kotlin.jvm': FqName@59) = null
+    packageFragments('p': FqName@60) = LazyJavaPackageFragment@61['p']
+    packageFragments('p.List': FqName@62) = null
+    packageFragments('p.MutableList': FqName@63) = null
+    packageFragments('p.String': FqName@64) = null
+    topLevelClasses(JavaClassImpl@65['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@44['<root>'] {
-    classes('J': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('List': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('MutableList': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('String': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('list': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('J': Name@67) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('list': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('p': Name@74) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@68
+LazyJavaPackageFragment@43['<root>'] {
+    classes('J': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('List': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('MutableList': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('String': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('J': Name@66) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('p': Name@74) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
-LazyJavaPackageFragment@49['java'] {
+LazyJavaPackageFragment@48['java'] {
     classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('lang': Name@78) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('lang': Name@78) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-LazyJavaPackageFragment@51['lang'] {
-    classes('J': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('list': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('J': Name@67) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('list': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+LazyJavaPackageFragment@50['lang'] {
+    classes('J': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('J': Name@66) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-LazyJavaPackageFragment@62['p'] {
-    classes('J': Name@67) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('List': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('MutableList': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('String': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('list': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('J': Name@67) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('list': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+LazyJavaPackageFragment@61['p'] {
+    classes('J': Name@66) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('List': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('MutableList': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('String': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@72 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('J': Name@66) = EmptyList@73[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
+
+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]
+    <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]
+    <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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
index cb6159c5561..bcc1d18bb99 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBounds.lazy.log
@@ -49,28 +49,28 @@ 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@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@44['K'] {
     arguments = ArrayList@45[empty]
     classifier = JavaTypeParameterImpl@46['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@47['K'] {
     arguments = ArrayList@48[empty]
     classifier = JavaTypeParameterImpl@46['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@50['K'] {
@@ -82,16 +82,16 @@ LazyJavaClassifierType@50['K'] {
 
 LazyJavaClassifierType@52['K'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@42['K']
+    classifier = JavaTypeParameterImpl@43['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
     classifier = JavaTypeParameterImpl@39['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
@@ -154,35 +154,35 @@ 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@94['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@91['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@99['V'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@101['V'] {
@@ -274,30 +274,58 @@ LazyJavaPackageFragment@132['util'] {
 
 LazyJavaTypeParameterDescriptor@18['K'] {
     defaultType = JetTypeImpl@169['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
     upperBounds = LinkedHashSet@170[1] { NullableType@171 }
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
     defaultType = JetTypeImpl@172['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
     upperBounds = LinkedHashSet@173[1] { NullableType@174 }
 }
 
 LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaTypeParameterResolver@175 {
-    resolve(JavaTypeParameterImpl@176['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@177['V']) = LazyJavaTypeParameterDescriptor@19['V']
+    resolve(JavaTypeParameterImpl@34['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
 }
 
-LazyJavaTypeParameterResolver@178 {
-    resolve(JavaTypeParameterImpl@42['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@83['V']) = LazyJavaTypeParameterDescriptor@14['V']
+LazyJavaTypeParameterResolver@176 {
+    resolve(JavaTypeParameterImpl@177['K']) = LazyJavaTypeParameterDescriptor@18['K']
+    resolve(JavaTypeParameterImpl@178['V']) = LazyJavaTypeParameterDescriptor@19['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@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[4] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = EmptyList@154[empty]
+    <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 b1f3a95bddc..00e14368ab2 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/multipleExactBoundsNullable.lazy.log
@@ -49,14 +49,14 @@ 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@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@44['K'] {
@@ -68,14 +68,14 @@ LazyJavaClassifierType@44['K'] {
 
 LazyJavaClassifierType@47['K'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@46['K']
+    classifier = JavaTypeParameterImpl@43['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@50['K'] {
     arguments = ArrayList@51[empty]
-    classifier = JavaTypeParameterImpl@39['K']
+    classifier = JavaTypeParameterImpl@46['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
@@ -89,9 +89,9 @@ LazyJavaClassifierType@52['K'] {
 
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@42['K']
+    classifier = JavaTypeParameterImpl@39['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 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@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
-LazyJavaClassifierType@88['V'] {
-    arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@90['V']
+LazyJavaClassifierType@89['V'] {
+    arguments = ArrayList@90[empty]
+    classifier = JavaTypeParameterImpl@91['V']
     nullable = 'false': Boolean@35
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-LazyJavaClassifierType@91['V'] {
-    arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@93['V']
+LazyJavaClassifierType@92['V'] {
+    arguments = ArrayList@93[empty]
+    classifier = JavaTypeParameterImpl@94['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@95['V'] {
     arguments = ArrayList@96[empty]
-    classifier = JavaTypeParameterImpl@93['V']
+    classifier = JavaTypeParameterImpl@87['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@91['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@99['V'] {
     arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@87['V']
+    classifier = JavaTypeParameterImpl@94['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaClassifierType@101['V'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@90['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
@@ -234,69 +234,147 @@ LazyJavaPackageFragment@105['<root>'] {
     classes('Map': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@142
     classes('ResolverForProjectImpl': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@142
     classes('String': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('foo': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    classes('java': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@142
-    deserializedPackageScope = Empty@148 // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('HashMap': Name@149) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('ResolverForProjectImpl': Name@144) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('foo': Name@146) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    functions('java': Name@151) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@142
-    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@142
+    classes('java': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@142
+    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('HashMap': Name@148) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('ResolverForProjectImpl': Name@144) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    functions('java': Name@150) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@142
+    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@142
 }
 
 LazyJavaPackageFragment@115['java'] {
-    classes('lang': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('util': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@154
-    deserializedPackageScope = Empty@148 // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('lang': Name@156) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('util': Name@157) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('lang': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@153
+    classes('util': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@153
+    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@153
+    functions('lang': Name@155) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@153
+    functions('util': Name@156) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@153
+    memberIndex = computeMemberIndex$1@157 // through LazyPackageFragmentScopeForJavaPackage@153
 }
 
 LazyJavaPackageFragment@119['lang'] {
-    classes('HashMap': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('ResolverForProjectImpl': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('foo': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@148 // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('HashMap': Name@149) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('ResolverForProjectImpl': Name@144) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('foo': Name@146) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('HashMap': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@158
+    classes('ResolverForProjectImpl': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@158
+    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@158
+    functions('HashMap': Name@148) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@158
+    functions('ResolverForProjectImpl': Name@144) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@158
+    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@158
 }
 
 LazyJavaPackageFragment@128['util'] {
-    classes('HashMap': Name@161) = LazyJavaClassDescriptor@2['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@162
-    deserializedPackageScope = Empty@148 // through LazyPackageFragmentScopeForJavaPackage@162
-    functions('HashMap': Name@163) = EmptyList@150[empty] // through LazyPackageFragmentScopeForJavaPackage@162
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@162
+    classes('HashMap': Name@160) = LazyJavaClassDescriptor@2['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@161
+    deserializedPackageScope = Empty@147 // through LazyPackageFragmentScopeForJavaPackage@161
+    functions('HashMap': Name@162) = EmptyList@149[empty] // through LazyPackageFragmentScopeForJavaPackage@161
+    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
 }
 
 LazyJavaTypeParameterDescriptor@18['K'] {
-    defaultType = JetTypeImpl@165['K']
+    defaultType = JetTypeImpl@164['K']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
-    upperBounds = LinkedHashSet@166[1] { NullableType@167 }
+    upperBounds = LinkedHashSet@165[1] { NullableType@166 }
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
-    defaultType = JetTypeImpl@168['V']
+    defaultType = JetTypeImpl@167['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
-    upperBounds = LinkedHashSet@169[1] { NullableType@170 }
+    upperBounds = LinkedHashSet@168[1] { NullableType@169 }
 }
 
 LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
-LazyJavaTypeParameterResolver@171 {
-    resolve(JavaTypeParameterImpl@42['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@93['V']) = LazyJavaTypeParameterDescriptor@14['V']
+LazyJavaTypeParameterResolver@170 {
+    resolve(JavaTypeParameterImpl@171['K']) = LazyJavaTypeParameterDescriptor@18['K']
+    resolve(JavaTypeParameterImpl@172['V']) = LazyJavaTypeParameterDescriptor@19['V']
 }
 
-LazyJavaTypeParameterResolver@172 {
-    resolve(JavaTypeParameterImpl@173['K']) = LazyJavaTypeParameterDescriptor@18['K']
-    resolve(JavaTypeParameterImpl@174['V']) = LazyJavaTypeParameterDescriptor@19['V']
+LazyJavaTypeParameterResolver@173 {
+    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['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]
+    <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@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[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, ... }
+    <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 9b2e6cfd06b..6de914e9836 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/objectArray.lazy.log
@@ -7,96 +7,160 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('arr': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('arr': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['J'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['Object'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['Object']
-    nullable = 'false': Boolean@20
-    typeConstructor = DeserializedClassTypeConstructor@21
+LazyJavaClassifierType@16['Object'] {
+    arguments = ArrayList@17[empty]
+    classifier = JavaClassImpl@18['Object']
+    nullable = 'false': Boolean@19
+    typeConstructor = DeserializedClassTypeConstructor@20
 }
 
-LazyJavaClassifierType@22['Object'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@19['Object']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@21
+LazyJavaClassifierType@21['Object'] {
+    arguments = ArrayList@22[empty]
+    classifier = JavaClassImpl@18['Object']
+    nullable = 'true': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@20
 }
 
-LazyJavaClassifierType@25['Object'] {
-    classifier = JavaClassImpl@26['Object']
-    typeConstructor = DeserializedClassTypeConstructor@21
+LazyJavaClassifierType@24['Object'] {
+    classifier = JavaClassImpl@25['Object']
+    typeConstructor = DeserializedClassTypeConstructor@20
 }
 
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('Any': FqName@30) = null
-    packageFragments('Array': FqName@31) = null
-    packageFragments('String': FqName@32) = null
-    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    packageFragments('java.lang.Any': FqName@37) = null
-    packageFragments('java.lang.Array': FqName@38) = null
-    packageFragments('java.lang.String': FqName@39) = null
-    packageFragments('kotlin': FqName@40) = null
-    packageFragments('kotlin.Any': FqName@41) = null
-    packageFragments('kotlin.Array': FqName@42) = null
-    packageFragments('kotlin.String': FqName@43) = null
-    packageFragments('kotlin.io': FqName@44) = null
-    packageFragments('kotlin.jvm': FqName@45) = null
-    packageFragments('p': FqName@46) = LazyJavaPackageFragment@47['p']
-    packageFragments('p.Any': FqName@48) = null
-    packageFragments('p.Array': FqName@49) = null
-    packageFragments('p.String': FqName@50) = null
-    topLevelClasses(JavaClassImpl@51['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@26 {
+    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
+    packageFragments('Any': FqName@29) = null
+    packageFragments('Array': FqName@30) = null
+    packageFragments('String': FqName@31) = null
+    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
+    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
+    packageFragments('java.lang.Any': FqName@36) = null
+    packageFragments('java.lang.Array': FqName@37) = null
+    packageFragments('java.lang.String': FqName@38) = null
+    packageFragments('kotlin': FqName@39) = null
+    packageFragments('kotlin.Any': FqName@40) = null
+    packageFragments('kotlin.Array': FqName@41) = null
+    packageFragments('kotlin.String': FqName@42) = null
+    packageFragments('kotlin.io': FqName@43) = null
+    packageFragments('kotlin.jvm': FqName@44) = null
+    packageFragments('p': FqName@45) = LazyJavaPackageFragment@46['p']
+    packageFragments('p.Any': FqName@47) = null
+    packageFragments('p.Array': FqName@48) = null
+    packageFragments('p.String': FqName@49) = null
+    topLevelClasses(JavaClassImpl@50['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@29['<root>'] {
-    classes('Any': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('Array': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('J': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('arr': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('J': Name@55) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('arr': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('p': Name@59) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@53
+LazyJavaPackageFragment@28['<root>'] {
+    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('J': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('String': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('p': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('J': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('p': Name@59) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@34['java'] {
+LazyJavaPackageFragment@33['java'] {
     classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('lang': Name@63) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('lang': Name@63) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@62
     memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
-LazyJavaPackageFragment@36['lang'] {
-    classes('J': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('arr': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('J': Name@55) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('arr': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+LazyJavaPackageFragment@35['lang'] {
+    classes('J': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('J': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@65
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
-LazyJavaPackageFragment@47['p'] {
-    classes('Any': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Array': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('J': Name@55) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('arr': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('J': Name@55) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('arr': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+LazyJavaPackageFragment@46['p'] {
+    classes('Any': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('Array': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('J': Name@54) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('String': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('J': Name@54) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@67
     memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@67
 }
+
+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]
+    <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 }
+    <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@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@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[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
index 647feec9027..d2b63921495 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/overloadingForSubclass.lazy.log
@@ -70,14 +70,14 @@ LazyJavaClassifierType@53['String'] {
 
 LazyJavaClassifierType@56['String'] {
     arguments = ArrayList@57[empty]
-    classifier = JavaClassImpl@55['String']
+    classifier = JavaClassImpl@50['String']
     nullable = 'true': Boolean@58
     typeConstructor = DeserializedClassTypeConstructor@52
 }
 
 LazyJavaClassifierType@59['String'] {
     arguments = ArrayList@60[empty]
-    classifier = JavaClassImpl@50['String']
+    classifier = JavaClassImpl@55['String']
     nullable = 'true': Boolean@58
     typeConstructor = DeserializedClassTypeConstructor@52
 }
@@ -152,40 +152,58 @@ LazyJavaPackageFragment@75['<root>'] {
     classes('Sub': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@106
     classes('Super': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@106
     classes('Util': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    classes('p': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('p': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@106
     functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('foo': Name@111) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('p': Name@114) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('p': Name@113) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
 LazyJavaPackageFragment@82['java'] {
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('lang': Name@118) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('lang': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('lang': Name@117) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
 LazyJavaPackageFragment@84['lang'] {
-    classes('C': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('foo': Name@111) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('C': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@119
 }
 
 LazyJavaPackageFragment@97['p'] {
-    classes('C': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Sub': Name@108) = LazyJavaClassDescriptor@0['Sub'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Super': Name@109) = LazyJavaClassDescriptor@2['Super'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Util': Name@110) = LazyJavaClassDescriptor@4['Util'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@113 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@111) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('C': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('String': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Sub': Name@108) = LazyJavaClassDescriptor@0['Sub'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Super': Name@109) = LazyJavaClassDescriptor@2['Super'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Util': Name@110) = LazyJavaClassDescriptor@4['Util'] // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@112 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('C': Name@105) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
+}
+
+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@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+}
+
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[2] { ResolutionCandidate@137, ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[2] { ResolutionCandidate@137, ResolutionCandidate@138 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
index 0b883273e7f..7fee9c14e3d 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/sam.lazy.log
@@ -88,14 +88,14 @@ LazyJavaClassifierType@48['Void'] {
 
 LazyJavaClassifierType@51['Void'] {
     arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@50['Void']
+    classifier = JavaClassImpl@47['Void']
     nullable = 'true': Boolean@37
     typeConstructor = LazyJavaClassTypeConstructor@18['Void']
 }
 
 LazyJavaClassifierType@53['Void'] {
     arguments = ArrayList@54[empty]
-    classifier = JavaClassImpl@47['Void']
+    classifier = JavaClassImpl@50['Void']
     nullable = 'true': Boolean@37
     typeConstructor = LazyJavaClassTypeConstructor@18['Void']
 }
@@ -153,3 +153,30 @@ LazyJavaTypeParameterResolver@86 {
 LazyJavaTypeParameterResolver@88 {
     resolve(JavaTypeParameterImpl@32['R']) = null
 }
+
+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]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <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]
+    <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/singleton.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
index d121ec847ed..61b91b65db1 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/singleton.lazy.log
@@ -59,7 +59,7 @@ LazyJavaClassifierType@37['T'] {
 
 LazyJavaClassifierType@40['T'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaTypeParameterImpl@36['T']
+    classifier = JavaTypeParameterImpl@39['T']
     nullable = 'true': Boolean@28
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
@@ -73,7 +73,7 @@ LazyJavaClassifierType@42['T'] {
 
 LazyJavaClassifierType@44['T'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaTypeParameterImpl@39['T']
+    classifier = JavaTypeParameterImpl@36['T']
     nullable = 'true': Boolean@28
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
@@ -129,3 +129,114 @@ LazyJavaTypeParameterDescriptor@78['T'] {
 LazyJavaTypeParameterResolver@81 {
     resolve(JavaTypeParameterImpl@82['T']) = LazyJavaTypeParameterDescriptor@78['T']
 }
+
+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]
+    <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@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> = 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@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 {
+    <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/platformTypes/methodCall/string.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
index 56c86b7130e..d452cd13d0a 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/string.lazy.log
@@ -7,78 +7,108 @@ LazyJavaClassDescriptor@0['J'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('str': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('str': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['J'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['J'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['J']
-    nullable = 'false': Boolean@20
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+LazyJavaClassifierType@16['J'] {
+    arguments = ArrayList@17[empty]
+    classifier = JavaClassImpl@18['J']
+    nullable = 'false': Boolean@19
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassifierType@21['J'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@19['J']
-    nullable = 'true': Boolean@23
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+LazyJavaClassifierType@20['J'] {
+    arguments = ArrayList@21[empty]
+    classifier = JavaClassImpl@18['J']
+    nullable = 'true': Boolean@22
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassifierType@24['Object'] {
-    classifier = JavaClassImpl@25['Object']
-    typeConstructor = DeserializedClassTypeConstructor@26
+LazyJavaClassifierType@23['Object'] {
+    classifier = JavaClassImpl@24['Object']
+    typeConstructor = DeserializedClassTypeConstructor@25
 }
 
-LazyJavaPackageFragmentProvider@27 {
-    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
-    packageFragments('java': FqName@30) = LazyJavaPackageFragment@31['java']
-    packageFragments('java.lang': FqName@32) = LazyJavaPackageFragment@33['lang']
-    packageFragments('kotlin': FqName@34) = null
-    packageFragments('kotlin.io': FqName@35) = null
-    packageFragments('kotlin.jvm': FqName@36) = null
-    packageFragments('p': FqName@37) = LazyJavaPackageFragment@38['p']
-    topLevelClasses(JavaClassImpl@39['J']) = LazyJavaClassDescriptor@0['J']
+LazyJavaPackageFragmentProvider@26 {
+    packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
+    packageFragments('java': FqName@29) = LazyJavaPackageFragment@30['java']
+    packageFragments('java.lang': FqName@31) = LazyJavaPackageFragment@32['lang']
+    packageFragments('kotlin': FqName@33) = null
+    packageFragments('kotlin.io': FqName@34) = null
+    packageFragments('kotlin.jvm': FqName@35) = null
+    packageFragments('p': FqName@36) = LazyJavaPackageFragment@37['p']
+    topLevelClasses(JavaClassImpl@38['J']) = LazyJavaClassDescriptor@0['J']
 }
 
-LazyJavaPackageFragment@29['<root>'] {
-    classes('J': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('p': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('str': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('J': Name@40) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('p': Name@44) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('str': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@41
+LazyJavaPackageFragment@28['<root>'] {
+    classes('J': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('p': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('J': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    functions('p': Name@44) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@40
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@40
 }
 
-LazyJavaPackageFragment@31['java'] {
+LazyJavaPackageFragment@30['java'] {
     classes('lang': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('lang': Name@48) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('lang': Name@48) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
-LazyJavaPackageFragment@33['lang'] {
-    classes('J': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('str': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('J': Name@40) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('str': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@50
+LazyJavaPackageFragment@32['lang'] {
+    classes('J': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@50
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@50
+    functions('J': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@50
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@50
 }
 
-LazyJavaPackageFragment@38['p'] {
-    classes('J': Name@40) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('str': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('J': Name@40) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('str': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+LazyJavaPackageFragment@37['p'] {
+    classes('J': Name@39) = LazyJavaClassDescriptor@0['J'] // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('J': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@52
     memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
 }
+
+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]
+    <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@70 {
+    <name not found> = ArrayList@71[1] { ResolutionCandidate@72 }
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@72 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
index 6316d296ac8..da48808fd52 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/methodCall/visitor.lazy.log
@@ -5,181 +5,182 @@ LazyJavaClassDescriptor@0['Element'] {
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@8 // through LazyJavaClassMemberScope@3
     nestedClasses('accept': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('accept': Name@4) = EmptyList@9[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['Element']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['Element']
 }
 
-LazyJavaClassDescriptor@12['Visitor'] {
+LazyJavaClassDescriptor@11['Visitor'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@13['Visitor']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Visitor']
 }
 
-LazyJavaClassTypeConstructor@11['Element'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@10['Element'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassTypeConstructor@13['Visitor'] {
-    parameters = ArrayList@17[1] { LazyJavaTypeParameterDescriptor@18['D'] }
-    supertypes = ArrayList@19[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['Visitor'] {
+    parameters = ArrayList@16[1] { LazyJavaTypeParameterDescriptor@17['D'] }
+    supertypes = ArrayList@18[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@20['D'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaTypeParameterImpl@22['D']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
+LazyJavaClassifierType@19['D'] {
+    arguments = ArrayList@20[empty]
+    classifier = JavaTypeParameterImpl@21['D']
+    nullable = 'false': Boolean@22
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
 
-LazyJavaClassifierType@25['D'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaTypeParameterImpl@27['D']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
+LazyJavaClassifierType@24['D'] {
+    arguments = ArrayList@25[empty]
+    classifier = JavaTypeParameterImpl@26['D']
+    nullable = 'false': Boolean@22
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
 
-LazyJavaClassifierType@28['D'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaTypeParameterImpl@30['D']
-    nullable = 'false': Boolean@23
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
+LazyJavaClassifierType@27['D'] {
+    arguments = ArrayList@28[empty]
+    classifier = JavaTypeParameterImpl@29['D']
+    nullable = 'false': Boolean@22
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
 
-LazyJavaClassifierType@31['D'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaTypeParameterImpl@27['D']
-    nullable = 'true': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
+LazyJavaClassifierType@30['D'] {
+    arguments = ArrayList@31[empty]
+    classifier = JavaTypeParameterImpl@29['D']
+    nullable = 'true': Boolean@32
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
 
-LazyJavaClassifierType@34['D'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaTypeParameterImpl@22['D']
-    nullable = 'true': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
+LazyJavaClassifierType@33['D'] {
+    arguments = ArrayList@34[empty]
+    classifier = JavaTypeParameterImpl@21['D']
+    nullable = 'true': Boolean@32
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
 
-LazyJavaClassifierType@36['D'] {
-    arguments = ArrayList@37[empty]
-    classifier = JavaTypeParameterImpl@30['D']
-    nullable = 'true': Boolean@33
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
+LazyJavaClassifierType@35['D'] {
+    arguments = ArrayList@36[empty]
+    classifier = JavaTypeParameterImpl@26['D']
+    nullable = 'true': Boolean@32
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
 }
 
-LazyJavaClassifierType@38['Object'] {
-    classifier = JavaClassImpl@39['Object']
-    typeConstructor = DeserializedClassTypeConstructor@40
+LazyJavaClassifierType@37['Object'] {
+    classifier = JavaClassImpl@38['Object']
+    typeConstructor = DeserializedClassTypeConstructor@39
 }
 
-LazyJavaClassifierType@41['Object'] {
-    classifier = JavaClassImpl@42['Object']
-    typeConstructor = DeserializedClassTypeConstructor@40
+LazyJavaClassifierType@40['Object'] {
+    classifier = JavaClassImpl@41['Object']
+    typeConstructor = DeserializedClassTypeConstructor@39
 }
 
-LazyJavaClassifierType@43['R'] {
-    arguments = ArrayList@44[empty]
+LazyJavaClassifierType@42['R'] {
+    arguments = ArrayList@43[empty]
     classifier = null
-    nullable = 'false': Boolean@23
-    typeConstructor = TypeConstructorImpl$1@45
+    nullable = 'false': Boolean@22
+    typeConstructor = TypeConstructorImpl$1@44
 }
 
-LazyJavaClassifierType@46['R'] {
+LazyJavaClassifierType@45['R'] {
     classifier = null
-    nullable = 'true': Boolean@33
-    typeConstructor = TypeConstructorImpl$1@47
+    nullable = 'true': Boolean@32
+    typeConstructor = TypeConstructorImpl$1@46
 }
 
-LazyJavaClassifierType@48['Visitor<D>'] {
-    arguments = ArrayList@49[1] { TypeProjectionImpl@50 }
-    classifier = JavaClassImpl@51['Visitor']
-    memberScope = SubstitutingScope@52
-    nullable = 'false': Boolean@23
-    typeConstructor = LazyJavaClassTypeConstructor@13['Visitor']
+LazyJavaClassifierType@47['Visitor<D>'] {
+    arguments = ArrayList@48[1] { TypeProjectionImpl@49 }
+    classifier = JavaClassImpl@50['Visitor']
+    memberScope = SubstitutingScope@51
+    nullable = 'false': Boolean@22
+    typeConstructor = LazyJavaClassTypeConstructor@12['Visitor']
 }
 
-LazyJavaClassifierType@53['Visitor<D>'] {
-    arguments = ArrayList@54[1] { TypeProjectionImpl@55 }
-    classifier = JavaClassImpl@51['Visitor']
-    memberScope = SubstitutingScope@56
-    nullable = 'true': Boolean@33
-    typeConstructor = LazyJavaClassTypeConstructor@13['Visitor']
+LazyJavaClassifierType@52['Visitor<D>'] {
+    arguments = ArrayList@53[1] { TypeProjectionImpl@54 }
+    classifier = JavaClassImpl@50['Visitor']
+    memberScope = SubstitutingScope@55
+    nullable = 'true': Boolean@32
+    typeConstructor = LazyJavaClassTypeConstructor@12['Visitor']
 }
 
-LazyJavaPackageFragmentProvider@57 {
-    packageFragments('<root>': FqName@58) = LazyJavaPackageFragment@59['<root>']
-    packageFragments('Element': FqName@60) = null
-    packageFragments('Nothing': FqName@61) = null
-    packageFragments('Visitor': FqName@62) = null
-    packageFragments('java': FqName@63) = LazyJavaPackageFragment@64['java']
-    packageFragments('java.lang': FqName@65) = LazyJavaPackageFragment@66['lang']
-    packageFragments('java.lang.Element': FqName@67) = null
-    packageFragments('java.lang.Nothing': FqName@68) = null
-    packageFragments('java.lang.Visitor': FqName@69) = null
-    packageFragments('kotlin': FqName@70) = null
-    packageFragments('kotlin.Element': FqName@71) = null
-    packageFragments('kotlin.Nothing': FqName@72) = null
-    packageFragments('kotlin.Visitor': FqName@73) = null
-    packageFragments('kotlin.io': FqName@74) = null
-    packageFragments('kotlin.jvm': FqName@75) = null
-    packageFragments('p': FqName@76) = LazyJavaPackageFragment@77['p']
-    packageFragments('p.Element': FqName@78) = null
-    packageFragments('p.Nothing': FqName@79) = null
-    packageFragments('p.Visitor': FqName@80) = null
-    topLevelClasses(JavaClassImpl@81['Element']) = LazyJavaClassDescriptor@0['Element']
-    topLevelClasses(JavaClassImpl@82['Visitor']) = LazyJavaClassDescriptor@12['Visitor']
+LazyJavaPackageFragmentProvider@56 {
+    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
+    packageFragments('Element': FqName@59) = null
+    packageFragments('Nothing': FqName@60) = null
+    packageFragments('Visitor': FqName@61) = null
+    packageFragments('java': FqName@62) = LazyJavaPackageFragment@63['java']
+    packageFragments('java.lang': FqName@64) = LazyJavaPackageFragment@65['lang']
+    packageFragments('java.lang.Element': FqName@66) = null
+    packageFragments('java.lang.Nothing': FqName@67) = null
+    packageFragments('java.lang.Visitor': FqName@68) = null
+    packageFragments('kotlin': FqName@69) = null
+    packageFragments('kotlin.Element': FqName@70) = null
+    packageFragments('kotlin.Nothing': FqName@71) = null
+    packageFragments('kotlin.Visitor': FqName@72) = null
+    packageFragments('kotlin.io': FqName@73) = null
+    packageFragments('kotlin.jvm': FqName@74) = null
+    packageFragments('p': FqName@75) = LazyJavaPackageFragment@76['p']
+    packageFragments('p.Element': FqName@77) = null
+    packageFragments('p.Nothing': FqName@78) = null
+    packageFragments('p.Visitor': FqName@79) = null
+    topLevelClasses(JavaClassImpl@80['Element']) = LazyJavaClassDescriptor@0['Element']
+    topLevelClasses(JavaClassImpl@81['Visitor']) = LazyJavaClassDescriptor@11['Visitor']
 }
 
-LazyJavaPackageFragment@59['<root>'] {
-    classes('Element': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Nothing': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('Visitor': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('accept': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('p': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('accept': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('p': Name@89) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@84
+LazyJavaPackageFragment@58['<root>'] {
+    classes('Element': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('Nothing': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('Visitor': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('p': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('p': Name@88) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-LazyJavaPackageFragment@64['java'] {
+LazyJavaPackageFragment@63['java'] {
     classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = Empty@87 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-LazyJavaPackageFragment@66['lang'] {
-    classes('accept': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('accept': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+LazyJavaPackageFragment@76['p'] {
+    classes('Element': Name@82) = LazyJavaClassDescriptor@0['Element'] // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Nothing': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('Visitor': Name@85) = LazyJavaClassDescriptor@11['Visitor'] // through LazyPackageFragmentScopeForJavaPackage@95
 }
 
-LazyJavaPackageFragment@77['p'] {
-    classes('Element': Name@83) = LazyJavaClassDescriptor@0['Element'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('Nothing': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('Visitor': Name@86) = LazyJavaClassDescriptor@12['Visitor'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('accept': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('accept': Name@4) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
+LazyJavaTypeParameterDescriptor@17['D'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@96
+    upperBounds = LinkedHashSet@97[1] { NullableType@98 }
 }
 
-LazyJavaTypeParameterDescriptor@18['D'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+LazyJavaTypeParameterDescriptor@99['D'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@23
     upperBounds = LinkedHashSet@100[1] { NullableType@101 }
 }
 
-LazyJavaTypeParameterDescriptor@102['D'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@24
-    upperBounds = LinkedHashSet@103[1] { NullableType@104 }
+LazyJavaTypeParameterResolver@102 {
+    resolve(JavaTypeParameterImpl@103['D']) = LazyJavaTypeParameterDescriptor@17['D']
 }
 
-LazyJavaTypeParameterResolver@105 {
-    resolve(JavaTypeParameterImpl@106['D']) = LazyJavaTypeParameterDescriptor@18['D']
+LazyJavaTypeParameterResolver@104 {
+    resolve(JavaTypeParameterImpl@105['D']) = LazyJavaTypeParameterDescriptor@99['D']
 }
 
-LazyJavaTypeParameterResolver@107 {
-    resolve(JavaTypeParameterImpl@108['D']) = LazyJavaTypeParameterDescriptor@102['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@114 {
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@116 }
+    <name not found> = ArrayList@117[1] { ResolutionCandidate@116 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
index 098cb6fd32e..6b2b287e25e 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/nullableTypeArgument.lazy.log
@@ -2,59 +2,54 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     defaultType = JetTypeImpl@1['AbstractCollection<1>']
     functions('iterator': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['iterator'] } // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('iterator': 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['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('iterator': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['iterator'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@16
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+LazyJavaClassDescriptor@9['AbstractList'] {
+    defaultType = JetTypeImpl@10['AbstractList<1>']
+    functions('iterator': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['iterator'] } // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@16['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
-LazyJavaClassDescriptor@20['ArrayList'] {
-    constructors = ArrayList@21[3] { JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'] } // through LazyJavaClassMemberScope@25
-    defaultType = JetTypeImpl@26['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@25
+LazyJavaClassDescriptor@18['ArrayList'] {
+    constructors = ArrayList@19[3] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'] } // through LazyJavaClassMemberScope@23
+    defaultType = JetTypeImpl@24['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
     functionTypeForSamInterface = null
-    functions('iterator': Name@7) = ArrayList@28[1] { JavaMethodDescriptor@29['iterator'] } // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@25
-    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@25
-    nestedClasses('iterator': Name@7) = null // through LazyJavaClassMemberScope@25
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@33['ArrayList']
+    functions('iterator': Name@26) = ArrayList@27[1] { JavaMethodDescriptor@28['iterator'] } // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
+    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@23
+    nestedClasses('iterator': Name@26) = null // through LazyJavaClassMemberScope@23
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@32['ArrayList']
 }
 
-LazyJavaClassDescriptor@34['RandomAccess'] {
-    functions('iterator': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@35
+LazyJavaClassDescriptor@33['RandomAccess'] {
+    functions('iterator': Name@11) = EmptyList@34[empty] // through LazyJavaClassMemberScope@35
     memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@35
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@35
     typeConstructor = LazyJavaClassTypeConstructor@37['RandomAccess']
 }
 
 LazyJavaClassDescriptor@38['Serializable'] {
-    functions('iterator': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@39
+    functions('iterator': Name@11) = EmptyList@34[empty] // through LazyJavaClassMemberScope@39
     memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@39
     typeConstructor = LazyJavaClassTypeConstructor@41['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@42[1] { LazyJavaTypeParameterDescriptor@43['E'] }
     supertypes = ArrayList@44[1] { LazyJavaClassifierType@45['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@19['AbstractList'] {
+LazyJavaClassTypeConstructor@17['AbstractList'] {
     parameters = ArrayList@46[1] { LazyJavaTypeParameterDescriptor@47['E'] }
     supertypes = ArrayList@48[2] { LazyJavaClassifierType@49['AbstractCollection<E>'], LazyJavaClassifierType@50['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@33['ArrayList'] {
+LazyJavaClassTypeConstructor@32['ArrayList'] {
     parameters = ArrayList@51[1] { LazyJavaTypeParameterDescriptor@52['E'] }
     supertypes = ArrayList@53[5] { LazyJavaClassifierType@54['AbstractList<E>'], LazyJavaClassifierType@55['List<E>'], LazyJavaClassifierType@56['RandomAccess'], ... }
 }
@@ -73,14 +68,14 @@ LazyJavaClassifierType@49['AbstractCollection<E>'] {
     arguments = ArrayList@62[1] { TypeProjectionImpl@63 }
     classifier = JavaClassImpl@64['AbstractCollection']
     memberScope = SubstitutingScope@65
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@54['AbstractList<E>'] {
     arguments = ArrayList@66[1] { TypeProjectionImpl@67 }
     classifier = JavaClassImpl@68['AbstractList']
     memberScope = SubstitutingScope@69
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
 LazyJavaClassifierType@70['Cloneable'] {
@@ -124,175 +119,175 @@ LazyJavaClassifierType@96['E'] {
     arguments = ArrayList@97[empty]
     classifier = JavaTypeParameterImpl@98['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-LazyJavaClassifierType@99['E'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaTypeParameterImpl@101['E']
+LazyJavaClassifierType@100['E'] {
+    arguments = ArrayList@101[empty]
+    classifier = JavaTypeParameterImpl@102['E']
+    nullable = 'false': Boolean@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+}
+
+LazyJavaClassifierType@103['E'] {
+    arguments = ArrayList@104[empty]
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'false': Boolean@80
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
-LazyJavaClassifierType@102['E'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+LazyJavaClassifierType@106['E'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaTypeParameterImpl@108['E']
+    nullable = 'false': Boolean@80
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+}
+
+LazyJavaClassifierType@110['E'] {
+    arguments = ArrayList@111[empty]
+    classifier = JavaTypeParameterImpl@112['E']
     nullable = 'false': Boolean@80
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
-LazyJavaClassifierType@105['E'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+LazyJavaClassifierType@113['E'] {
+    arguments = ArrayList@114[empty]
+    classifier = JavaTypeParameterImpl@115['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-}
-
-LazyJavaClassifierType@109['E'] {
-    arguments = ArrayList@110[empty]
-    classifier = JavaTypeParameterImpl@111['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-}
-
-LazyJavaClassifierType@112['E'] {
-    arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@114['E']
-    nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@116['E'] {
     arguments = ArrayList@117[empty]
     classifier = JavaTypeParameterImpl@118['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@119['E'] {
     arguments = ArrayList@120[empty]
     classifier = JavaTypeParameterImpl@121['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@122['E'] {
     arguments = ArrayList@123[empty]
     classifier = JavaTypeParameterImpl@124['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@125['E'] {
     arguments = ArrayList@126[empty]
     classifier = JavaTypeParameterImpl@127['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@128['E'] {
     arguments = ArrayList@129[empty]
     classifier = JavaTypeParameterImpl@130['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@80
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@134['E'] {
     arguments = ArrayList@135[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@127['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@136['E'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@104['E']
+    classifier = JavaTypeParameterImpl@108['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@138['E'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@101['E']
+    classifier = JavaTypeParameterImpl@118['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@140['E'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@127['E']
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@142['E'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@94['E']
+    classifier = JavaTypeParameterImpl@112['E']
     nullable = 'true': Boolean@86
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@144['E'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@121['E']
+    classifier = JavaTypeParameterImpl@124['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@146['E'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@118['E']
+    classifier = JavaTypeParameterImpl@133['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@148['E'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@115['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@150['E'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@152['E'] {
     arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@114['E']
+    classifier = JavaTypeParameterImpl@130['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@154['E'] {
     arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@111['E']
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'true': Boolean@86
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
-    classifier = JavaTypeParameterImpl@124['E']
+    classifier = JavaTypeParameterImpl@121['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
 }
 
 LazyJavaClassifierType@158['E'] {
     arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@130['E']
+    classifier = JavaTypeParameterImpl@98['E']
     nullable = 'true': Boolean@86
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@160['Iterator<E>'] {
@@ -321,7 +316,7 @@ LazyJavaClassifierType@171['Iterator<E>'] {
 
 LazyJavaClassifierType@176['Iterator<E>'] {
     arguments = ArrayList@177[1] { TypeProjectionImpl@178 }
-    classifier = JavaClassImpl@169['Iterator']
+    classifier = JavaClassImpl@174['Iterator']
     memberScope = SubstitutingScope@179
     nullable = 'true': Boolean@86
     typeConstructor = DeserializedClassTypeConstructor@180
@@ -337,7 +332,7 @@ LazyJavaClassifierType@181['Iterator<E>'] {
 
 LazyJavaClassifierType@185['Iterator<E>'] {
     arguments = ArrayList@186[1] { TypeProjectionImpl@187 }
-    classifier = JavaClassImpl@174['Iterator']
+    classifier = JavaClassImpl@169['Iterator']
     memberScope = SubstitutingScope@188
     nullable = 'true': Boolean@86
     typeConstructor = DeserializedClassTypeConstructor@180
@@ -400,75 +395,67 @@ LazyJavaPackageFragmentProvider@210 {
     packageFragments('kotlin.io': FqName@226) = null
     packageFragments('kotlin.jvm': FqName@227) = null
     topLevelClasses(JavaClassImpl@64['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@68['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@228['ArrayList']) = LazyJavaClassDescriptor@20['ArrayList']
-    topLevelClasses(JavaClassImpl@206['RandomAccess']) = LazyJavaClassDescriptor@34['RandomAccess']
+    topLevelClasses(JavaClassImpl@68['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
+    topLevelClasses(JavaClassImpl@228['ArrayList']) = LazyJavaClassDescriptor@18['ArrayList']
+    topLevelClasses(JavaClassImpl@206['RandomAccess']) = LazyJavaClassDescriptor@33['RandomAccess']
     topLevelClasses(JavaClassImpl@209['Serializable']) = LazyJavaClassDescriptor@38['Serializable']
 }
 
 LazyJavaPackageFragment@212['<root>'] {
     classes('ArrayList': Name@229) = null // through LazyPackageFragmentScopeForJavaPackage@230
     classes('String': Name@231) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('hasNext': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('iterator': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('java': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    classes('next': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@230
-    deserializedPackageScope = Empty@235 // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('ArrayList': Name@236) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('hasNext': Name@232) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('iterator': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('java': Name@237) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    functions('next': Name@234) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@230
-    memberIndex = computeMemberIndex$1@238 // through LazyPackageFragmentScopeForJavaPackage@230
+    classes('java': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@230
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@230
+    functions('ArrayList': Name@234) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@230
+    functions('java': Name@235) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@230
+    memberIndex = computeMemberIndex$1@236 // through LazyPackageFragmentScopeForJavaPackage@230
 }
 
 LazyJavaPackageFragment@215['java'] {
-    classes('lang': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    classes('util': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@240
-    deserializedPackageScope = Empty@235 // through LazyPackageFragmentScopeForJavaPackage@240
-    functions('lang': Name@242) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@240
-    functions('util': Name@243) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@240
-    memberIndex = computeMemberIndex$1@244 // through LazyPackageFragmentScopeForJavaPackage@240
+    classes('lang': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('util': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@238
+    functions('lang': Name@240) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@238
+    functions('util': Name@241) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@238
+    memberIndex = computeMemberIndex$1@242 // through LazyPackageFragmentScopeForJavaPackage@238
 }
 
 LazyJavaPackageFragment@219['lang'] {
-    classes('ArrayList': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@245
-    classes('hasNext': Name@232) = null // through LazyPackageFragmentScopeForJavaPackage@245
-    classes('iterator': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@245
-    classes('next': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@245
-    deserializedPackageScope = Empty@235 // through LazyPackageFragmentScopeForJavaPackage@245
-    functions('ArrayList': Name@236) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@245
-    functions('hasNext': Name@232) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@245
-    functions('iterator': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@245
-    functions('next': Name@234) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@245
-    memberIndex = computeMemberIndex$1@246 // through LazyPackageFragmentScopeForJavaPackage@245
+    classes('ArrayList': Name@234) = null // through LazyPackageFragmentScopeForJavaPackage@243
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@243
+    functions('ArrayList': Name@234) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@243
+    memberIndex = computeMemberIndex$1@244 // through LazyPackageFragmentScopeForJavaPackage@243
 }
 
 LazyJavaPackageFragment@222['util'] {
-    classes('ArrayList': Name@247) = LazyJavaClassDescriptor@20['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@248
-    deserializedPackageScope = Empty@235 // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('ArrayList': Name@249) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    memberIndex = computeMemberIndex$1@250 // through LazyPackageFragmentScopeForJavaPackage@248
+    classes('ArrayList': Name@245) = LazyJavaClassDescriptor@18['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@246
+    deserializedPackageScope = Empty@233 // through LazyPackageFragmentScopeForJavaPackage@246
+    functions('ArrayList': Name@247) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@246
+    memberIndex = computeMemberIndex$1@248 // through LazyPackageFragmentScopeForJavaPackage@246
 }
 
 LazyJavaTypeParameterDescriptor@47['E'] {
-    defaultType = JetTypeImpl@251['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
-    upperBounds = LinkedHashSet@252[1] { NullableType@253 }
-    upperBoundsAsType = NullableType@253
+    defaultType = JetTypeImpl@249['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    upperBounds = LinkedHashSet@250[1] { NullableType@251 }
+    upperBoundsAsType = NullableType@251
 }
 
 LazyJavaTypeParameterDescriptor@43['E'] {
-    defaultType = JetTypeImpl@254['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
-    upperBounds = LinkedHashSet@255[1] { NullableType@256 }
-    upperBoundsAsType = NullableType@256
+    defaultType = JetTypeImpl@252['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
+    upperBounds = LinkedHashSet@253[1] { NullableType@254 }
+    upperBoundsAsType = NullableType@254
 }
 
 LazyJavaTypeParameterDescriptor@52['E'] {
-    defaultType = JetTypeImpl@257['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
-    upperBounds = LinkedHashSet@258[1] { NullableType@259 }
+    defaultType = JetTypeImpl@255['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    upperBounds = LinkedHashSet@256[1] { NullableType@257 }
+}
+
+LazyJavaTypeParameterResolver@258 {
+    resolve(JavaTypeParameterImpl@259['E']) = LazyJavaTypeParameterDescriptor@43['E']
 }
 
 LazyJavaTypeParameterResolver@260 {
@@ -476,21 +463,69 @@ LazyJavaTypeParameterResolver@260 {
 }
 
 LazyJavaTypeParameterResolver@262 {
-    resolve(JavaTypeParameterImpl@263['E']) = LazyJavaTypeParameterDescriptor@43['E']
+    resolve(JavaTypeParameterImpl@263['E']) = LazyJavaTypeParameterDescriptor@52['E']
 }
 
 LazyJavaTypeParameterResolver@264 {
-    resolve(JavaTypeParameterImpl@265['E']) = LazyJavaTypeParameterDescriptor@52['E']
+    resolve(JavaTypeParameterImpl@121['E']) = null
+}
+
+LazyJavaTypeParameterResolver@265 {
+    resolve(JavaTypeParameterImpl@127['E']) = null
 }
 
 LazyJavaTypeParameterResolver@266 {
-    resolve(JavaTypeParameterImpl@107['E']) = null
+    resolve(JavaTypeParameterImpl@94['E']) = null
 }
 
-LazyJavaTypeParameterResolver@267 {
-    resolve(JavaTypeParameterImpl@101['E']) = null
+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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
 }
 
-LazyJavaTypeParameterResolver@268 {
-    resolve(JavaTypeParameterImpl@114['E']) = null
+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[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
+    <name not found> = ArrayList@296[3] { ResolutionCandidate@293, ResolutionCandidate@294, ResolutionCandidate@295 }
+    <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/platformTypes/override.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
index 05245a0850f..4799841f9b9 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/override.lazy.log
@@ -6,131 +6,156 @@ LazyJavaClassDescriptor@1['I'] {
     defaultType = JetTypeImpl@2['I']
     functions('s': Name@3) = ArrayList@4[1] { JavaMethodDescriptor@5['s'] } // through LazyJavaClassMemberScope@6
     memberIndex = computeMemberIndex$1@7 // through LazyJavaClassMemberScope@6
-    properties('s': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@11['I']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@8['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@9['I']
 }
 
-LazyJavaClassDescriptor@12['J'] {
-    constructors = ArrayList@13[1] { JavaConstructorDescriptor@14['<init>'] } // through LazyJavaClassMemberScope@15
-    defaultType = JetTypeImpl@16['J']
-    enumEntryIndex = LinkedHashMap@17 // through LazyJavaClassMemberScope@15
+LazyJavaClassDescriptor@10['J'] {
+    constructors = ArrayList@11[1] { JavaConstructorDescriptor@12['<init>'] } // through LazyJavaClassMemberScope@13
+    defaultType = JetTypeImpl@14['J']
+    enumEntryIndex = LinkedHashMap@15 // through LazyJavaClassMemberScope@13
     functionTypeForSamInterface = null
-    functions('s': Name@8) = ArrayList@18[1] { JavaMethodDescriptor@19['s'] } // through LazyJavaClassMemberScope@15
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@15
-    nestedClassIndex = LinkedHashMap@21 // through LazyJavaClassMemberScope@15
-    nestedClasses('s': Name@8) = null // through LazyJavaClassMemberScope@15
-    properties('s': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@15
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@23['J']
+    functions('s': Name@16) = ArrayList@17[1] { JavaMethodDescriptor@18['s'] } // through LazyJavaClassMemberScope@13
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@13
+    nestedClassIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@13
+    nestedClasses('s': Name@16) = null // through LazyJavaClassMemberScope@13
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@22['J']
 }
 
-LazyJavaClassTypeConstructor@11['I'] {
-    parameters = ArrayList@24[empty]
-    supertypes = ArrayList@25[1] { JetTypeImpl@26['Any'] }
+LazyJavaClassTypeConstructor@9['I'] {
+    parameters = ArrayList@23[empty]
+    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
 }
 
-LazyJavaClassTypeConstructor@23['J'] {
-    parameters = ArrayList@27[empty]
-    supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['I'] }
+LazyJavaClassTypeConstructor@22['J'] {
+    parameters = ArrayList@26[empty]
+    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['I'] }
 }
 
-LazyJavaClassifierType@29['I'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@31['I']
+LazyJavaClassifierType@28['I'] {
+    arguments = ArrayList@29[empty]
+    classifier = JavaClassImpl@30['I']
     memberScope = LazyJavaClassMemberScope@6
-    typeConstructor = LazyJavaClassTypeConstructor@11['I']
+    typeConstructor = LazyJavaClassTypeConstructor@9['I']
 }
 
-LazyJavaClassifierType@32['Object'] {
-    classifier = JavaClassImpl@33['Object']
-    typeConstructor = DeserializedClassTypeConstructor@34
+LazyJavaClassifierType@31['Object'] {
+    classifier = JavaClassImpl@32['Object']
+    typeConstructor = DeserializedClassTypeConstructor@33
 }
 
-LazyJavaClassifierType@35['Object'] {
-    classifier = JavaClassImpl@36['Object']
-    typeConstructor = DeserializedClassTypeConstructor@34
+LazyJavaClassifierType@34['Object'] {
+    classifier = JavaClassImpl@35['Object']
+    typeConstructor = DeserializedClassTypeConstructor@33
 }
 
-LazyJavaClassifierType@37['String'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['String']
-    memberScope = DeserializedClassMemberScope@40
-    nullable = 'false': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@36['String'] {
+    arguments = ArrayList@37[empty]
+    classifier = JavaClassImpl@38['String']
+    memberScope = DeserializedClassMemberScope@39
+    nullable = 'false': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaClassifierType@43['String'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'false': Boolean@41
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@42['String'] {
+    arguments = ArrayList@43[empty]
+    classifier = JavaClassImpl@44['String']
+    nullable = 'false': Boolean@40
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaClassifierType@46['String'] {
-    arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@45['String']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@45['String'] {
+    arguments = ArrayList@46[empty]
+    classifier = JavaClassImpl@44['String']
+    nullable = 'true': Boolean@47
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaClassifierType@49['String'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@39['String']
-    nullable = 'true': Boolean@48
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@48['String'] {
+    arguments = ArrayList@49[empty]
+    classifier = JavaClassImpl@38['String']
+    nullable = 'true': Boolean@47
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaPackageFragmentProvider@51 {
-    packageFragments('<root>': FqName@52) = LazyJavaPackageFragment@53['<root>']
-    packageFragments('java': FqName@54) = LazyJavaPackageFragment@55['java']
-    packageFragments('java.lang': FqName@56) = LazyJavaPackageFragment@57['lang']
-    packageFragments('kotlin': FqName@58) = null
-    packageFragments('kotlin.io': FqName@59) = null
-    packageFragments('kotlin.jvm': FqName@60) = null
-    packageFragments('p': FqName@61) = LazyJavaPackageFragment@62['p']
-    topLevelClasses(JavaClassImpl@31['I']) = LazyJavaClassDescriptor@1['I']
-    topLevelClasses(JavaClassImpl@63['J']) = LazyJavaClassDescriptor@12['J']
+LazyJavaPackageFragmentProvider@50 {
+    packageFragments('<root>': FqName@51) = LazyJavaPackageFragment@52['<root>']
+    packageFragments('java': FqName@53) = LazyJavaPackageFragment@54['java']
+    packageFragments('java.lang': FqName@55) = LazyJavaPackageFragment@56['lang']
+    packageFragments('kotlin': FqName@57) = null
+    packageFragments('kotlin.io': FqName@58) = null
+    packageFragments('kotlin.jvm': FqName@59) = null
+    packageFragments('p': FqName@60) = LazyJavaPackageFragment@61['p']
+    topLevelClasses(JavaClassImpl@30['I']) = LazyJavaClassDescriptor@1['I']
+    topLevelClasses(JavaClassImpl@62['J']) = LazyJavaClassDescriptor@10['J']
 }
 
-LazyJavaPackageFragment@53['<root>'] {
-    classes('J': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('get': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('p': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('s': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('J': Name@64) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('get': Name@66) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('p': Name@69) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('s': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@65
+LazyJavaPackageFragment@52['<root>'] {
+    classes('J': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('p': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('J': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('p': Name@68) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
+LazyJavaPackageFragment@54['java'] {
+    classes('lang': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('lang': Name@72) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
-LazyJavaPackageFragment@57['lang'] {
-    classes('J': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('get': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('s': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('J': Name@64) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('get': Name@66) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('s': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+LazyJavaPackageFragment@56['lang'] {
+    classes('J': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('J': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
-LazyJavaPackageFragment@62['p'] {
-    classes('J': Name@64) = LazyJavaClassDescriptor@12['J'] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('get': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('s': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@68 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('J': Name@64) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('get': Name@66) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('s': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+LazyJavaPackageFragment@61['p'] {
+    classes('J': Name@63) = LazyJavaClassDescriptor@10['J'] // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@66 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('J': Name@63) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
+}
+
+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@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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
index d5e0b4a7723..8049121b9ae 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/safeCall.lazy.log
@@ -9,112 +9,139 @@ LazyJavaClassDescriptor@2['J'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@5
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@5
     nestedClasses('s': Name@6) = null // through LazyJavaClassMemberScope@5
-    properties('s': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['J']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['J']
 }
 
-LazyJavaClassTypeConstructor@13['J'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['J'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
+LazyJavaClassifierType@16['Object'] {
+    classifier = JavaClassImpl@17['Object']
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    memberScope = DeserializedClassMemberScope@23
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@19['String'] {
+    arguments = ArrayList@20[empty]
+    classifier = JavaClassImpl@21['String']
+    memberScope = DeserializedClassMemberScope@22
+    nullable = 'false': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaClassifierType@26['String'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@28
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@25['String'] {
+    arguments = ArrayList@26[empty]
+    classifier = JavaClassImpl@21['String']
+    nullable = 'true': Boolean@27
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaPackageFragmentProvider@29 {
-    packageFragments('<root>': FqName@30) = LazyJavaPackageFragment@31['<root>']
-    packageFragments('Int': FqName@32) = null
-    packageFragments('J': FqName@33) = null
-    packageFragments('T': FqName@34) = null
-    packageFragments('Unit': FqName@35) = null
-    packageFragments('_': FqName@36) = null
-    packageFragments('java': FqName@37) = LazyJavaPackageFragment@38['java']
-    packageFragments('java.lang': FqName@39) = LazyJavaPackageFragment@40['lang']
-    packageFragments('java.lang.Int': FqName@41) = null
-    packageFragments('java.lang.J': FqName@42) = null
-    packageFragments('java.lang.T': FqName@43) = null
-    packageFragments('java.lang.Unit': FqName@44) = null
-    packageFragments('java.lang._': FqName@45) = null
-    packageFragments('kotlin': FqName@46) = null
-    packageFragments('kotlin.Int': FqName@47) = null
-    packageFragments('kotlin.J': FqName@48) = null
-    packageFragments('kotlin.T': FqName@49) = null
-    packageFragments('kotlin.Unit': FqName@50) = null
-    packageFragments('kotlin._': FqName@51) = null
-    packageFragments('kotlin.io': FqName@52) = null
-    packageFragments('kotlin.jvm': FqName@53) = null
-    packageFragments('p': FqName@54) = LazyJavaPackageFragment@55['p']
-    packageFragments('p.Int': FqName@56) = null
-    packageFragments('p.J': FqName@57) = null
-    packageFragments('p._': FqName@58) = null
-    packageFragments('tests': FqName@59) = null
-    packageFragments('tests._checkType': FqName@60) = null
-    packageFragments('tests._checkType.Int': FqName@61) = null
-    packageFragments('tests._checkType.J': FqName@62) = null
-    packageFragments('tests._checkType.T': FqName@63) = null
-    packageFragments('tests._checkType.Unit': FqName@64) = null
-    packageFragments('tests._checkType._': FqName@65) = null
-    topLevelClasses(JavaClassImpl@66['J']) = LazyJavaClassDescriptor@2['J']
+LazyJavaPackageFragmentProvider@28 {
+    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
+    packageFragments('Int': FqName@31) = null
+    packageFragments('J': FqName@32) = null
+    packageFragments('T': FqName@33) = null
+    packageFragments('Unit': FqName@34) = null
+    packageFragments('_': FqName@35) = null
+    packageFragments('java': FqName@36) = LazyJavaPackageFragment@37['java']
+    packageFragments('java.lang': FqName@38) = LazyJavaPackageFragment@39['lang']
+    packageFragments('java.lang.Int': FqName@40) = null
+    packageFragments('java.lang.J': FqName@41) = null
+    packageFragments('java.lang.T': FqName@42) = null
+    packageFragments('java.lang.Unit': FqName@43) = null
+    packageFragments('java.lang._': FqName@44) = null
+    packageFragments('kotlin': FqName@45) = null
+    packageFragments('kotlin.Int': FqName@46) = null
+    packageFragments('kotlin.J': FqName@47) = null
+    packageFragments('kotlin.T': FqName@48) = null
+    packageFragments('kotlin.Unit': FqName@49) = null
+    packageFragments('kotlin._': FqName@50) = null
+    packageFragments('kotlin.io': FqName@51) = null
+    packageFragments('kotlin.jvm': FqName@52) = null
+    packageFragments('p': FqName@53) = LazyJavaPackageFragment@54['p']
+    packageFragments('p.Int': FqName@55) = null
+    packageFragments('p.J': FqName@56) = null
+    packageFragments('p._': FqName@57) = null
+    packageFragments('tests': FqName@58) = null
+    packageFragments('tests._checkType': FqName@59) = null
+    packageFragments('tests._checkType.Int': FqName@60) = null
+    packageFragments('tests._checkType.J': FqName@61) = null
+    packageFragments('tests._checkType.T': FqName@62) = null
+    packageFragments('tests._checkType.Unit': FqName@63) = null
+    packageFragments('tests._checkType._': FqName@64) = null
+    topLevelClasses(JavaClassImpl@65['J']) = LazyJavaClassDescriptor@2['J']
 }
 
-LazyJavaPackageFragment@31['<root>'] {
-    classes('Int': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('J': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('_': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('checkType': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('p': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('s': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('tests': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('checkType': Name@71) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('p': Name@75) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('s': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('tests': Name@76) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@68
+LazyJavaPackageFragment@30['<root>'] {
+    classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('J': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('_': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('checkType': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('p': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('tests': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('checkType': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('p': Name@75) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('tests': Name@76) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
-LazyJavaPackageFragment@38['java'] {
+LazyJavaPackageFragment@37['java'] {
     classes('lang': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@79
-    functions('lang': Name@80) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('lang': Name@80) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@79
     memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@40['lang'] {
-    classes('checkType': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('s': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('checkType': Name@71) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('s': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+LazyJavaPackageFragment@39['lang'] {
+    classes('checkType': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('checkType': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
-LazyJavaPackageFragment@55['p'] {
-    classes('Int': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('J': Name@69) = LazyJavaClassDescriptor@2['J'] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('_': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('checkType': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('s': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('checkType': Name@71) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('s': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@84
+LazyJavaPackageFragment@54['p'] {
+    classes('Int': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('J': Name@68) = LazyJavaClassDescriptor@2['J'] // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('_': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('checkType': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@73 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('checkType': Name@70) = EmptyList@74[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
 }
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log b/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
index 25edac6b899..a6d59c07614 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/samConstructor.lazy.log
@@ -126,28 +126,28 @@ LazyJavaClassifierType@84['T'] {
 
 LazyJavaClassifierType@87['T'] {
     arguments = ArrayList@88[empty]
-    classifier = JavaTypeParameterImpl@86['T']
+    classifier = JavaTypeParameterImpl@76['T']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@89['T'] {
     arguments = ArrayList@90[empty]
-    classifier = JavaTypeParameterImpl@76['T']
+    classifier = JavaTypeParameterImpl@83['T']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@91['T'] {
     arguments = ArrayList@92[empty]
-    classifier = JavaTypeParameterImpl@83['T']
+    classifier = JavaTypeParameterImpl@80['T']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
 
 LazyJavaClassifierType@93['T'] {
     arguments = ArrayList@94[empty]
-    classifier = JavaTypeParameterImpl@80['T']
+    classifier = JavaTypeParameterImpl@86['T']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
 }
@@ -174,67 +174,110 @@ LazyJavaPackageFragment@97['<root>'] {
     classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('J': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('java': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('minus': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('p': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('p': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@116
     functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('java': Name@122) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('minus': Name@119) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('p': Name@123) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('java': Name@121) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('p': Name@122) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
 LazyJavaPackageFragment@100['java'] {
-    classes('lang': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('util': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('lang': Name@128) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('util': Name@129) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('lang': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('util': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('lang': Name@127) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('util': Name@128) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
 LazyJavaPackageFragment@102['lang'] {
-    classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('minus': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('minus': Name@119) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@112['p'] {
-    classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('J': Name@117) = LazyJavaClassDescriptor@31['J'] // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('minus': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('minus': Name@119) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('Comparator': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('J': Name@117) = LazyJavaClassDescriptor@31['J'] // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('Comparator': Name@115) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
 LazyJavaPackageFragment@105['util'] {
-    classes('Comparator': Name@115) = LazyJavaClassDescriptor@0['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('minus': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('Comparator': Name@115) = ArrayList@136[1] { SamConstructorDescriptor@137['Comparator'] } // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('minus': Name@119) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Comparator': Name@115) = LazyJavaClassDescriptor@0['Comparator'] // through LazyPackageFragmentScopeForJavaPackage@134
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@134
+    functions('Comparator': Name@115) = ArrayList@135[1] { SamConstructorDescriptor@136['Comparator'] } // through LazyPackageFragmentScopeForJavaPackage@134
+    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@134
 }
 
 LazyJavaTypeParameterDescriptor@44['T'] {
-    defaultType = JetTypeImpl@139['T']
+    defaultType = JetTypeImpl@138['T']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-    upperBounds = LinkedHashSet@140[1] { NullableType@141 }
+    upperBounds = LinkedHashSet@139[1] { NullableType@140 }
 }
 
-LazyJavaTypeParameterResolver@142 {
-    resolve(JavaTypeParameterImpl@143['T']) = LazyJavaTypeParameterDescriptor@44['T']
+LazyJavaTypeParameterResolver@141 {
+    resolve(JavaTypeParameterImpl@142['T']) = LazyJavaTypeParameterDescriptor@44['T']
+}
+
+LazyJavaTypeParameterResolver@143 {
+    resolve(JavaTypeParameterImpl@86['T']) = null
 }
 
 LazyJavaTypeParameterResolver@144 {
-    resolve(JavaTypeParameterImpl@80['T']) = null
-}
-
-LazyJavaTypeParameterResolver@145 {
     resolve(JavaTypeParameterImpl@83['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]
+    <name not found> = EmptyList@12[empty]
+    <name not found> = EmptyList@12[empty]
+    <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@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[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]
+}
+
+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]
+    <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 e426c05bc44..1bbe4c3e0a0 100644
--- a/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/platformTypes/supertypeTypeArguments.lazy.log
@@ -300,7 +300,7 @@ LazyJavaClassifierType@315['Collection<V>'] {
 
 LazyJavaClassifierType@320['Collection<V>'] {
     arguments = ArrayList@321[1] { TypeProjectionImpl@322 }
-    classifier = JavaClassImpl@307['Collection']
+    classifier = JavaClassImpl@318['Collection']
     memberScope = SubstitutingScope@323
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@325
@@ -316,7 +316,7 @@ LazyJavaClassifierType@326['Collection<V>'] {
 
 LazyJavaClassifierType@330['Collection<V>'] {
     arguments = ArrayList@331[1] { TypeProjectionImpl@332 }
-    classifier = JavaClassImpl@318['Collection']
+    classifier = JavaClassImpl@307['Collection']
     memberScope = SubstitutingScope@333
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@325
@@ -452,7 +452,7 @@ LazyJavaClassifierType@424['Entry<K, V>'] {
 
 LazyJavaClassifierType@430['Entry<K, V>'] {
     arguments = ArrayList@431[2] { TypeProjectionImpl@432, TypeProjectionImpl@433 }
-    classifier = JavaClassImpl@368['Entry']
+    classifier = JavaClassImpl@392['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@398['Entry']
+    classifier = JavaClassImpl@368['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@362['Entry']
+    classifier = JavaClassImpl@356['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@386['Entry']
+    classifier = JavaClassImpl@380['Entry']
     memberScope = SubstitutingScope@450
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@435
@@ -484,7 +484,7 @@ LazyJavaClassifierType@446['Entry<K, V>'] {
 
 LazyJavaClassifierType@451['Entry<K, V>'] {
     arguments = ArrayList@452[2] { TypeProjectionImpl@453, TypeProjectionImpl@454 }
-    classifier = JavaClassImpl@404['Entry']
+    classifier = JavaClassImpl@374['Entry']
     memberScope = SubstitutingScope@455
     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@374['Entry']
+    classifier = JavaClassImpl@349['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@356['Entry']
+    classifier = JavaClassImpl@404['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@380['Entry']
+    classifier = JavaClassImpl@398['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@392['Entry']
+    classifier = JavaClassImpl@362['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@349['Entry']
+    classifier = JavaClassImpl@386['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@410['Entry']
+    classifier = JavaClassImpl@428['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@428['Entry']
+    classifier = JavaClassImpl@416['Entry']
     memberScope = SubstitutingScope@490
     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@416['Entry']
+    classifier = JavaClassImpl@410['Entry']
     memberScope = SubstitutingScope@500
     nullable = 'true': Boolean@324
     typeConstructor = LazyJavaClassTypeConstructor@106['Entry']
@@ -621,28 +621,28 @@ LazyJavaClassifierType@534['K'] {
     arguments = ArrayList@535[empty]
     classifier = JavaTypeParameterImpl@536['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
-LazyJavaClassifierType@538['K'] {
-    arguments = ArrayList@539[empty]
-    classifier = JavaTypeParameterImpl@540['K']
+LazyJavaClassifierType@537['K'] {
+    arguments = ArrayList@538[empty]
+    classifier = JavaTypeParameterImpl@539['K']
     nullable = 'false': Boolean@299
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
-LazyJavaClassifierType@541['K'] {
-    arguments = ArrayList@542[empty]
-    classifier = JavaTypeParameterImpl@543['K']
+LazyJavaClassifierType@540['K'] {
+    arguments = ArrayList@541[empty]
+    classifier = JavaTypeParameterImpl@542['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@544['K'] {
     arguments = ArrayList@545[empty]
     classifier = JavaTypeParameterImpl@546['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@547['K'] {
@@ -691,28 +691,28 @@ LazyJavaClassifierType@565['K'] {
     arguments = ArrayList@566[empty]
     classifier = JavaTypeParameterImpl@567['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@568['K'] {
     arguments = ArrayList@569[empty]
     classifier = JavaTypeParameterImpl@570['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@571['K'] {
     arguments = ArrayList@572[empty]
     classifier = JavaTypeParameterImpl@573['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@574['K'] {
     arguments = ArrayList@575[empty]
     classifier = JavaTypeParameterImpl@576['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@577['K'] {
@@ -733,7 +733,7 @@ LazyJavaClassifierType@583['K'] {
     arguments = ArrayList@584[empty]
     classifier = JavaTypeParameterImpl@585['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@586['K'] {
@@ -768,7 +768,7 @@ LazyJavaClassifierType@598['K'] {
     arguments = ArrayList@599[empty]
     classifier = JavaTypeParameterImpl@600['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@601['K'] {
@@ -796,21 +796,21 @@ LazyJavaClassifierType@610['K'] {
     arguments = ArrayList@611[empty]
     classifier = JavaTypeParameterImpl@612['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@613['K'] {
     arguments = ArrayList@614[empty]
     classifier = JavaTypeParameterImpl@615['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@616['K'] {
     arguments = ArrayList@617[empty]
     classifier = JavaTypeParameterImpl@618['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@619['K'] {
@@ -831,28 +831,28 @@ LazyJavaClassifierType@625['K'] {
     arguments = ArrayList@626[empty]
     classifier = JavaTypeParameterImpl@627['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@628['K'] {
     arguments = ArrayList@629[empty]
     classifier = JavaTypeParameterImpl@630['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@631['K'] {
     arguments = ArrayList@632[empty]
     classifier = JavaTypeParameterImpl@633['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@634['K'] {
     arguments = ArrayList@635[empty]
     classifier = JavaTypeParameterImpl@636['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@637['K'] {
@@ -887,7 +887,7 @@ LazyJavaClassifierType@649['K'] {
     arguments = ArrayList@650[empty]
     classifier = JavaTypeParameterImpl@651['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@652['K'] {
@@ -901,7 +901,7 @@ LazyJavaClassifierType@655['K'] {
     arguments = ArrayList@656[empty]
     classifier = JavaTypeParameterImpl@657['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@658['K'] {
@@ -950,7 +950,7 @@ LazyJavaClassifierType@676['K'] {
     arguments = ArrayList@677[empty]
     classifier = JavaTypeParameterImpl@678['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@679['K'] {
@@ -971,126 +971,126 @@ LazyJavaClassifierType@685['K'] {
     arguments = ArrayList@686[empty]
     classifier = JavaTypeParameterImpl@687['K']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@688['K'] {
     arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@536['K']
+    classifier = JavaTypeParameterImpl@576['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@690['K'] {
     arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@594['K']
+    classifier = JavaTypeParameterImpl@684['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@692['K'] {
     arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@600['K']
+    classifier = JavaTypeParameterImpl@552['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@694['K'] {
     arguments = ArrayList@695[empty]
-    classifier = JavaTypeParameterImpl@630['K']
+    classifier = JavaTypeParameterImpl@579['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@696['K'] {
     arguments = ArrayList@697[empty]
-    classifier = JavaTypeParameterImpl@570['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@698['K'] {
-    arguments = ArrayList@699[empty]
-    classifier = JavaTypeParameterImpl@558['K']
+    classifier = JavaTypeParameterImpl@591['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
+LazyJavaClassifierType@698['K'] {
+    arguments = ArrayList@699[empty]
+    classifier = JavaTypeParameterImpl@612['K']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+}
+
 LazyJavaClassifierType@700['K'] {
     arguments = ArrayList@701[empty]
-    classifier = JavaTypeParameterImpl@666['K']
+    classifier = JavaTypeParameterImpl@549['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@702['K'] {
     arguments = ArrayList@703[empty]
-    classifier = JavaTypeParameterImpl@684['K']
+    classifier = JavaTypeParameterImpl@627['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@704['K'] {
     arguments = ArrayList@705[empty]
-    classifier = JavaTypeParameterImpl@624['K']
+    classifier = JavaTypeParameterImpl@615['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@706['K'] {
     arguments = ArrayList@707[empty]
-    classifier = JavaTypeParameterImpl@609['K']
+    classifier = JavaTypeParameterImpl@585['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@708['K'] {
     arguments = ArrayList@709[empty]
-    classifier = JavaTypeParameterImpl@567['K']
+    classifier = JavaTypeParameterImpl@645['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@710['K'] {
     arguments = ArrayList@711[empty]
-    classifier = JavaTypeParameterImpl@645['K']
+    classifier = JavaTypeParameterImpl@630['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@712['K'] {
     arguments = ArrayList@713[empty]
-    classifier = JavaTypeParameterImpl@612['K']
+    classifier = JavaTypeParameterImpl@666['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@714['K'] {
     arguments = ArrayList@715[empty]
-    classifier = JavaTypeParameterImpl@543['K']
+    classifier = JavaTypeParameterImpl@558['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@716['K'] {
     arguments = ArrayList@717[empty]
-    classifier = JavaTypeParameterImpl@615['K']
+    classifier = JavaTypeParameterImpl@570['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@718['K'] {
     arguments = ArrayList@719[empty]
-    classifier = JavaTypeParameterImpl@576['K']
+    classifier = JavaTypeParameterImpl@654['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@720['K'] {
     arguments = ArrayList@721[empty]
-    classifier = JavaTypeParameterImpl@549['K']
+    classifier = JavaTypeParameterImpl@651['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@722['K'] {
@@ -1102,168 +1102,168 @@ LazyJavaClassifierType@722['K'] {
 
 LazyJavaClassifierType@724['K'] {
     arguments = ArrayList@725[empty]
-    classifier = JavaTypeParameterImpl@564['K']
+    classifier = JavaTypeParameterImpl@663['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@726['K'] {
     arguments = ArrayList@727[empty]
-    classifier = JavaTypeParameterImpl@681['K']
+    classifier = JavaTypeParameterImpl@624['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@728['K'] {
     arguments = ArrayList@729[empty]
-    classifier = JavaTypeParameterImpl@618['K']
+    classifier = JavaTypeParameterImpl@546['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@730['K'] {
     arguments = ArrayList@731[empty]
-    classifier = JavaTypeParameterImpl@687['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@732['K'] {
-    arguments = ArrayList@733[empty]
-    classifier = JavaTypeParameterImpl@675['K']
+    classifier = JavaTypeParameterImpl@588['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
+LazyJavaClassifierType@732['K'] {
+    arguments = ArrayList@733[empty]
+    classifier = JavaTypeParameterImpl@567['K']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+}
+
 LazyJavaClassifierType@734['K'] {
     arguments = ArrayList@735[empty]
-    classifier = JavaTypeParameterImpl@678['K']
+    classifier = JavaTypeParameterImpl@633['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@736['K'] {
     arguments = ArrayList@737[empty]
-    classifier = JavaTypeParameterImpl@552['K']
+    classifier = JavaTypeParameterImpl@669['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@738['K'] {
     arguments = ArrayList@739[empty]
-    classifier = JavaTypeParameterImpl@663['K']
+    classifier = JavaTypeParameterImpl@582['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@740['K'] {
     arguments = ArrayList@741[empty]
-    classifier = JavaTypeParameterImpl@606['K']
+    classifier = JavaTypeParameterImpl@564['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@742['K'] {
     arguments = ArrayList@743[empty]
-    classifier = JavaTypeParameterImpl@672['K']
+    classifier = JavaTypeParameterImpl@621['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@744['K'] {
     arguments = ArrayList@745[empty]
-    classifier = JavaTypeParameterImpl@636['K']
+    classifier = JavaTypeParameterImpl@555['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@746['K'] {
     arguments = ArrayList@747[empty]
-    classifier = JavaTypeParameterImpl@654['K']
+    classifier = JavaTypeParameterImpl@678['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@748['K'] {
     arguments = ArrayList@749[empty]
-    classifier = JavaTypeParameterImpl@621['K']
+    classifier = JavaTypeParameterImpl@681['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@750['K'] {
     arguments = ArrayList@751[empty]
-    classifier = JavaTypeParameterImpl@532['K']
+    classifier = JavaTypeParameterImpl@594['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@752['K'] {
     arguments = ArrayList@753[empty]
-    classifier = JavaTypeParameterImpl@627['K']
+    classifier = JavaTypeParameterImpl@648['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@754['K'] {
     arguments = ArrayList@755[empty]
-    classifier = JavaTypeParameterImpl@555['K']
+    classifier = JavaTypeParameterImpl@600['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@756['K'] {
     arguments = ArrayList@757[empty]
-    classifier = JavaTypeParameterImpl@651['K']
+    classifier = JavaTypeParameterImpl@606['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@758['K'] {
     arguments = ArrayList@759[empty]
-    classifier = JavaTypeParameterImpl@597['K']
+    classifier = JavaTypeParameterImpl@642['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@760['K'] {
     arguments = ArrayList@761[empty]
-    classifier = JavaTypeParameterImpl@561['K']
+    classifier = JavaTypeParameterImpl@660['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@762['K'] {
     arguments = ArrayList@763[empty]
-    classifier = JavaTypeParameterImpl@648['K']
+    classifier = JavaTypeParameterImpl@687['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@764['K'] {
     arguments = ArrayList@765[empty]
-    classifier = JavaTypeParameterImpl@546['K']
+    classifier = JavaTypeParameterImpl@539['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@766['K'] {
     arguments = ArrayList@767[empty]
-    classifier = JavaTypeParameterImpl@639['K']
+    classifier = JavaTypeParameterImpl@542['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@768['K'] {
     arguments = ArrayList@769[empty]
-    classifier = JavaTypeParameterImpl@573['K']
+    classifier = JavaTypeParameterImpl@675['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@770['K'] {
     arguments = ArrayList@771[empty]
-    classifier = JavaTypeParameterImpl@588['K']
+    classifier = JavaTypeParameterImpl@609['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
@@ -1272,68 +1272,68 @@ LazyJavaClassifierType@772['K'] {
     arguments = ArrayList@773[empty]
     classifier = JavaTypeParameterImpl@657['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@774['K'] {
     arguments = ArrayList@775[empty]
-    classifier = JavaTypeParameterImpl@669['K']
+    classifier = JavaTypeParameterImpl@618['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
 }
 
 LazyJavaClassifierType@776['K'] {
     arguments = ArrayList@777[empty]
-    classifier = JavaTypeParameterImpl@633['K']
+    classifier = JavaTypeParameterImpl@639['K']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@778['K'] {
     arguments = ArrayList@779[empty]
-    classifier = JavaTypeParameterImpl@660['K']
+    classifier = JavaTypeParameterImpl@536['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@780['K'] {
     arguments = ArrayList@781[empty]
-    classifier = JavaTypeParameterImpl@540['K']
+    classifier = JavaTypeParameterImpl@561['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@782['K'] {
     arguments = ArrayList@783[empty]
-    classifier = JavaTypeParameterImpl@582['K']
+    classifier = JavaTypeParameterImpl@672['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@784['K'] {
     arguments = ArrayList@785[empty]
-    classifier = JavaTypeParameterImpl@642['K']
+    classifier = JavaTypeParameterImpl@636['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
 LazyJavaClassifierType@786['K'] {
     arguments = ArrayList@787[empty]
-    classifier = JavaTypeParameterImpl@585['K']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
-}
-
-LazyJavaClassifierType@788['K'] {
-    arguments = ArrayList@789[empty]
-    classifier = JavaTypeParameterImpl@591['K']
+    classifier = JavaTypeParameterImpl@532['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
 
+LazyJavaClassifierType@788['K'] {
+    arguments = ArrayList@789[empty]
+    classifier = JavaTypeParameterImpl@573['K']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
+}
+
 LazyJavaClassifierType@790['K'] {
     arguments = ArrayList@791[empty]
-    classifier = JavaTypeParameterImpl@579['K']
+    classifier = JavaTypeParameterImpl@597['K']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
 }
@@ -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@803['Map']
+    classifier = JavaClassImpl@815['Map']
     memberScope = SubstitutingScope@821
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@822
@@ -1380,7 +1380,7 @@ LazyJavaClassifierType@817['Map<? extends K, ? extends V>'] {
 
 LazyJavaClassifierType@823['Map<? extends K, ? extends V>'] {
     arguments = ArrayList@824[2] { TypeProjectionImpl@825, TypeProjectionImpl@826 }
-    classifier = JavaClassImpl@815['Map']
+    classifier = JavaClassImpl@809['Map']
     memberScope = SubstitutingScope@827
     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@809['Map']
+    classifier = JavaClassImpl@796['Map']
     memberScope = SubstitutingScope@832
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@822
@@ -1396,7 +1396,7 @@ LazyJavaClassifierType@828['Map<? extends K, ? extends V>'] {
 
 LazyJavaClassifierType@833['Map<? extends K, ? extends V>'] {
     arguments = ArrayList@834[2] { TypeProjectionImpl@835, TypeProjectionImpl@836 }
-    classifier = JavaClassImpl@796['Map']
+    classifier = JavaClassImpl@803['Map']
     memberScope = SubstitutingScope@837
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@822
@@ -1540,7 +1540,7 @@ LazyJavaClassifierType@892['Object'] {
 
 LazyJavaClassifierType@895['Object'] {
     arguments = ArrayList@896[empty]
-    classifier = JavaClassImpl@858['Object']
+    classifier = JavaClassImpl@870['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@876['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@894['Object']
+    classifier = JavaClassImpl@885['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@873['Object']
+    classifier = JavaClassImpl@882['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@891['Object']
+    classifier = JavaClassImpl@873['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@888['Object']
+    classifier = JavaClassImpl@864['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@879['Object']
+    classifier = JavaClassImpl@850['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@864['Object']
+    classifier = JavaClassImpl@891['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@882['Object']
+    classifier = JavaClassImpl@858['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@885['Object']
+    classifier = JavaClassImpl@879['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@870['Object']
+    classifier = JavaClassImpl@876['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@850['Object']
+    classifier = JavaClassImpl@888['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@861['Object']
+    classifier = JavaClassImpl@894['Object']
     memberScope = DeserializedClassMemberScope@851
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@852
@@ -1750,7 +1750,7 @@ LazyJavaClassifierType@965['Set<Entry<K, V>>'] {
 
 LazyJavaClassifierType@970['Set<Entry<K, V>>'] {
     arguments = ArrayList@971[1] { TypeProjectionImpl@972 }
-    classifier = JavaClassImpl@958['Set']
+    classifier = JavaClassImpl@947['Set']
     memberScope = SubstitutingScope@973
     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@947['Set']
+    classifier = JavaClassImpl@958['Set']
     memberScope = SubstitutingScope@981
     nullable = 'true': Boolean@324
     typeConstructor = DeserializedClassTypeConstructor@969
@@ -1861,35 +1861,35 @@ LazyJavaClassifierType@1026['V'] {
     arguments = ArrayList@1027[empty]
     classifier = JavaTypeParameterImpl@1028['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
-LazyJavaClassifierType@1029['V'] {
-    arguments = ArrayList@1030[empty]
-    classifier = JavaTypeParameterImpl@1031['V']
+LazyJavaClassifierType@1030['V'] {
+    arguments = ArrayList@1031[empty]
+    classifier = JavaTypeParameterImpl@1032['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1033['V'] {
     arguments = ArrayList@1034[empty]
     classifier = JavaTypeParameterImpl@1035['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1036['V'] {
     arguments = ArrayList@1037[empty]
     classifier = JavaTypeParameterImpl@1038['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1039['V'] {
     arguments = ArrayList@1040[empty]
     classifier = JavaTypeParameterImpl@1041['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1042['V'] {
@@ -1917,28 +1917,28 @@ LazyJavaClassifierType@1051['V'] {
     arguments = ArrayList@1052[empty]
     classifier = JavaTypeParameterImpl@1053['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1054['V'] {
     arguments = ArrayList@1055[empty]
     classifier = JavaTypeParameterImpl@1056['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1057['V'] {
     arguments = ArrayList@1058[empty]
     classifier = JavaTypeParameterImpl@1059['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1060['V'] {
     arguments = ArrayList@1061[empty]
     classifier = JavaTypeParameterImpl@1062['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1063['V'] {
@@ -1973,21 +1973,21 @@ LazyJavaClassifierType@1075['V'] {
     arguments = ArrayList@1076[empty]
     classifier = JavaTypeParameterImpl@1077['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1078['V'] {
     arguments = ArrayList@1079[empty]
     classifier = JavaTypeParameterImpl@1080['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1081['V'] {
     arguments = ArrayList@1082[empty]
     classifier = JavaTypeParameterImpl@1083['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1084['V'] {
@@ -2001,7 +2001,7 @@ LazyJavaClassifierType@1087['V'] {
     arguments = ArrayList@1088[empty]
     classifier = JavaTypeParameterImpl@1089['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1090['V'] {
@@ -2015,28 +2015,28 @@ LazyJavaClassifierType@1093['V'] {
     arguments = ArrayList@1094[empty]
     classifier = JavaTypeParameterImpl@1095['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1096['V'] {
     arguments = ArrayList@1097[empty]
     classifier = JavaTypeParameterImpl@1098['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1099['V'] {
     arguments = ArrayList@1100[empty]
     classifier = JavaTypeParameterImpl@1101['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1102['V'] {
     arguments = ArrayList@1103[empty]
     classifier = JavaTypeParameterImpl@1104['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1105['V'] {
@@ -2064,7 +2064,7 @@ LazyJavaClassifierType@1114['V'] {
     arguments = ArrayList@1115[empty]
     classifier = JavaTypeParameterImpl@1116['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1117['V'] {
@@ -2092,14 +2092,14 @@ LazyJavaClassifierType@1126['V'] {
     arguments = ArrayList@1127[empty]
     classifier = JavaTypeParameterImpl@1128['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1129['V'] {
     arguments = ArrayList@1130[empty]
     classifier = JavaTypeParameterImpl@1131['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1132['V'] {
@@ -2127,14 +2127,14 @@ LazyJavaClassifierType@1141['V'] {
     arguments = ArrayList@1142[empty]
     classifier = JavaTypeParameterImpl@1143['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1144['V'] {
     arguments = ArrayList@1145[empty]
     classifier = JavaTypeParameterImpl@1146['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1147['V'] {
@@ -2155,28 +2155,28 @@ LazyJavaClassifierType@1153['V'] {
     arguments = ArrayList@1154[empty]
     classifier = JavaTypeParameterImpl@1155['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1156['V'] {
     arguments = ArrayList@1157[empty]
     classifier = JavaTypeParameterImpl@1158['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1159['V'] {
     arguments = ArrayList@1160[empty]
     classifier = JavaTypeParameterImpl@1161['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1162['V'] {
     arguments = ArrayList@1163[empty]
     classifier = JavaTypeParameterImpl@1164['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1165['V'] {
@@ -2204,21 +2204,21 @@ LazyJavaClassifierType@1174['V'] {
     arguments = ArrayList@1175[empty]
     classifier = JavaTypeParameterImpl@1176['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1177['V'] {
     arguments = ArrayList@1178[empty]
     classifier = JavaTypeParameterImpl@1179['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1180['V'] {
     arguments = ArrayList@1181[empty]
     classifier = JavaTypeParameterImpl@1182['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1183['V'] {
@@ -2232,7 +2232,7 @@ LazyJavaClassifierType@1186['V'] {
     arguments = ArrayList@1187[empty]
     classifier = JavaTypeParameterImpl@1188['V']
     nullable = 'false': Boolean@299
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1189['V'] {
@@ -2265,427 +2265,427 @@ LazyJavaClassifierType@1198['V'] {
 
 LazyJavaClassifierType@1201['V'] {
     arguments = ArrayList@1202[empty]
-    classifier = JavaTypeParameterImpl@1155['V']
+    classifier = JavaTypeParameterImpl@1125['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1203['V'] {
     arguments = ArrayList@1204[empty]
-    classifier = JavaTypeParameterImpl@1018['V']
+    classifier = JavaTypeParameterImpl@1083['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1205['V'] {
     arguments = ArrayList@1206[empty]
-    classifier = JavaTypeParameterImpl@1200['V']
+    classifier = JavaTypeParameterImpl@1025['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1207['V'] {
     arguments = ArrayList@1208[empty]
-    classifier = JavaTypeParameterImpl@1134['V']
+    classifier = JavaTypeParameterImpl@1089['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1209['V'] {
     arguments = ArrayList@1210[empty]
-    classifier = JavaTypeParameterImpl@1050['V']
+    classifier = JavaTypeParameterImpl@1028['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1211['V'] {
     arguments = ArrayList@1212[empty]
-    classifier = JavaTypeParameterImpl@1122['V']
+    classifier = JavaTypeParameterImpl@1191['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1213['V'] {
     arguments = ArrayList@1214[empty]
-    classifier = JavaTypeParameterImpl@1170['V']
+    classifier = JavaTypeParameterImpl@1134['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1215['V'] {
     arguments = ArrayList@1216[empty]
-    classifier = JavaTypeParameterImpl@1101['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
-}
-
-LazyJavaClassifierType@1217['V'] {
-    arguments = ArrayList@1218[empty]
-    classifier = JavaTypeParameterImpl@1107['V']
+    classifier = JavaTypeParameterImpl@1161['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
+LazyJavaClassifierType@1217['V'] {
+    arguments = ArrayList@1218[empty]
+    classifier = JavaTypeParameterImpl@1128['V']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+}
+
 LazyJavaClassifierType@1219['V'] {
     arguments = ArrayList@1220[empty]
-    classifier = JavaTypeParameterImpl@1191['V']
+    classifier = JavaTypeParameterImpl@1197['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1221['V'] {
     arguments = ArrayList@1222[empty]
-    classifier = JavaTypeParameterImpl@1173['V']
+    classifier = JavaTypeParameterImpl@1041['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1223['V'] {
     arguments = ArrayList@1224[empty]
-    classifier = JavaTypeParameterImpl@1182['V']
+    classifier = JavaTypeParameterImpl@1035['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1225['V'] {
     arguments = ArrayList@1226[empty]
-    classifier = JavaTypeParameterImpl@1152['V']
+    classifier = JavaTypeParameterImpl@1155['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1227['V'] {
     arguments = ArrayList@1228[empty]
-    classifier = JavaTypeParameterImpl@1179['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
-}
-
-LazyJavaClassifierType@1229['V'] {
-    arguments = ArrayList@1230[empty]
-    classifier = JavaTypeParameterImpl@1125['V']
+    classifier = JavaTypeParameterImpl@1143['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
+LazyJavaClassifierType@1229['V'] {
+    arguments = ArrayList@1230[empty]
+    classifier = JavaTypeParameterImpl@1116['V']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+}
+
 LazyJavaClassifierType@1231['V'] {
     arguments = ArrayList@1232[empty]
-    classifier = JavaTypeParameterImpl@1074['V']
+    classifier = JavaTypeParameterImpl@1101['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1233['V'] {
     arguments = ArrayList@1234[empty]
-    classifier = JavaTypeParameterImpl@1149['V']
+    classifier = JavaTypeParameterImpl@1122['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1235['V'] {
     arguments = ArrayList@1236[empty]
-    classifier = JavaTypeParameterImpl@1068['V']
+    classifier = JavaTypeParameterImpl@1164['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1237['V'] {
     arguments = ArrayList@1238[empty]
-    classifier = JavaTypeParameterImpl@1185['V']
+    classifier = JavaTypeParameterImpl@1104['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1239['V'] {
     arguments = ArrayList@1240[empty]
-    classifier = JavaTypeParameterImpl@1164['V']
+    classifier = JavaTypeParameterImpl@1149['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1241['V'] {
     arguments = ArrayList@1242[empty]
-    classifier = JavaTypeParameterImpl@1119['V']
+    classifier = JavaTypeParameterImpl@1131['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1243['V'] {
     arguments = ArrayList@1244[empty]
-    classifier = JavaTypeParameterImpl@1065['V']
+    classifier = JavaTypeParameterImpl@1059['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1245['V'] {
     arguments = ArrayList@1246[empty]
-    classifier = JavaTypeParameterImpl@1110['V']
+    classifier = JavaTypeParameterImpl@1062['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1247['V'] {
     arguments = ArrayList@1248[empty]
-    classifier = JavaTypeParameterImpl@1146['V']
+    classifier = JavaTypeParameterImpl@1068['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1249['V'] {
     arguments = ArrayList@1250[empty]
-    classifier = JavaTypeParameterImpl@1113['V']
+    classifier = JavaTypeParameterImpl@1086['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1251['V'] {
     arguments = ArrayList@1252[empty]
-    classifier = JavaTypeParameterImpl@1167['V']
+    classifier = JavaTypeParameterImpl@1119['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1253['V'] {
     arguments = ArrayList@1254[empty]
-    classifier = JavaTypeParameterImpl@1158['V']
+    classifier = JavaTypeParameterImpl@1022['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1255['V'] {
     arguments = ArrayList@1256[empty]
-    classifier = JavaTypeParameterImpl@1031['V']
+    classifier = JavaTypeParameterImpl@1185['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1257['V'] {
     arguments = ArrayList@1258[empty]
-    classifier = JavaTypeParameterImpl@1197['V']
+    classifier = JavaTypeParameterImpl@1137['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1259['V'] {
     arguments = ArrayList@1260[empty]
-    classifier = JavaTypeParameterImpl@1188['V']
+    classifier = JavaTypeParameterImpl@1092['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1261['V'] {
     arguments = ArrayList@1262[empty]
-    classifier = JavaTypeParameterImpl@1022['V']
+    classifier = JavaTypeParameterImpl@1080['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1263['V'] {
     arguments = ArrayList@1264[empty]
-    classifier = JavaTypeParameterImpl@1044['V']
+    classifier = JavaTypeParameterImpl@1056['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1265['V'] {
     arguments = ArrayList@1266[empty]
-    classifier = JavaTypeParameterImpl@1137['V']
+    classifier = JavaTypeParameterImpl@1074['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1267['V'] {
     arguments = ArrayList@1268[empty]
-    classifier = JavaTypeParameterImpl@1089['V']
+    classifier = JavaTypeParameterImpl@1095['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1269['V'] {
     arguments = ArrayList@1270[empty]
-    classifier = JavaTypeParameterImpl@1080['V']
+    classifier = JavaTypeParameterImpl@1071['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1271['V'] {
     arguments = ArrayList@1272[empty]
-    classifier = JavaTypeParameterImpl@1062['V']
+    classifier = JavaTypeParameterImpl@1065['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1273['V'] {
     arguments = ArrayList@1274[empty]
-    classifier = JavaTypeParameterImpl@1056['V']
+    classifier = JavaTypeParameterImpl@1110['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1275['V'] {
     arguments = ArrayList@1276[empty]
-    classifier = JavaTypeParameterImpl@1083['V']
+    classifier = JavaTypeParameterImpl@1113['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1277['V'] {
     arguments = ArrayList@1278[empty]
-    classifier = JavaTypeParameterImpl@1086['V']
+    classifier = JavaTypeParameterImpl@1107['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1279['V'] {
     arguments = ArrayList@1280[empty]
-    classifier = JavaTypeParameterImpl@1194['V']
+    classifier = JavaTypeParameterImpl@1182['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1281['V'] {
     arguments = ArrayList@1282[empty]
-    classifier = JavaTypeParameterImpl@1161['V']
+    classifier = JavaTypeParameterImpl@1140['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1283['V'] {
     arguments = ArrayList@1284[empty]
-    classifier = JavaTypeParameterImpl@1047['V']
+    classifier = JavaTypeParameterImpl@1200['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1285['V'] {
     arguments = ArrayList@1286[empty]
-    classifier = JavaTypeParameterImpl@1053['V']
+    classifier = JavaTypeParameterImpl@1047['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1287['V'] {
     arguments = ArrayList@1288[empty]
-    classifier = JavaTypeParameterImpl@1128['V']
+    classifier = JavaTypeParameterImpl@1158['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1289['V'] {
     arguments = ArrayList@1290[empty]
-    classifier = JavaTypeParameterImpl@1140['V']
+    classifier = JavaTypeParameterImpl@1176['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1291['V'] {
     arguments = ArrayList@1292[empty]
-    classifier = JavaTypeParameterImpl@1077['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
-}
-
-LazyJavaClassifierType@1293['V'] {
-    arguments = ArrayList@1294[empty]
-    classifier = JavaTypeParameterImpl@1095['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
-}
-
-LazyJavaClassifierType@1295['V'] {
-    arguments = ArrayList@1296[empty]
-    classifier = JavaTypeParameterImpl@1059['V']
+    classifier = JavaTypeParameterImpl@1173['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
+LazyJavaClassifierType@1293['V'] {
+    arguments = ArrayList@1294[empty]
+    classifier = JavaTypeParameterImpl@1053['V']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+}
+
+LazyJavaClassifierType@1295['V'] {
+    arguments = ArrayList@1296[empty]
+    classifier = JavaTypeParameterImpl@1146['V']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+}
+
 LazyJavaClassifierType@1297['V'] {
     arguments = ArrayList@1298[empty]
-    classifier = JavaTypeParameterImpl@1025['V']
+    classifier = JavaTypeParameterImpl@1167['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1299['V'] {
     arguments = ArrayList@1300[empty]
-    classifier = JavaTypeParameterImpl@1176['V']
+    classifier = JavaTypeParameterImpl@1170['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1301['V'] {
     arguments = ArrayList@1302[empty]
-    classifier = JavaTypeParameterImpl@1038['V']
+    classifier = JavaTypeParameterImpl@1044['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1303['V'] {
     arguments = ArrayList@1304[empty]
-    classifier = JavaTypeParameterImpl@1028['V']
+    classifier = JavaTypeParameterImpl@1018['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1305['V'] {
     arguments = ArrayList@1306[empty]
-    classifier = JavaTypeParameterImpl@1104['V']
-    nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
-}
-
-LazyJavaClassifierType@1307['V'] {
-    arguments = ArrayList@1308[empty]
-    classifier = JavaTypeParameterImpl@1041['V']
+    classifier = JavaTypeParameterImpl@1194['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
+LazyJavaClassifierType@1307['V'] {
+    arguments = ArrayList@1308[empty]
+    classifier = JavaTypeParameterImpl@1098['V']
+    nullable = 'true': Boolean@324
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
+}
+
 LazyJavaClassifierType@1309['V'] {
     arguments = ArrayList@1310[empty]
-    classifier = JavaTypeParameterImpl@1092['V']
+    classifier = JavaTypeParameterImpl@1188['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1311['V'] {
     arguments = ArrayList@1312[empty]
-    classifier = JavaTypeParameterImpl@1131['V']
+    classifier = JavaTypeParameterImpl@1077['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1313['V'] {
     arguments = ArrayList@1314[empty]
-    classifier = JavaTypeParameterImpl@1035['V']
+    classifier = JavaTypeParameterImpl@1050['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1315['V'] {
     arguments = ArrayList@1316[empty]
-    classifier = JavaTypeParameterImpl@1071['V']
+    classifier = JavaTypeParameterImpl@1038['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
 }
 
 LazyJavaClassifierType@1317['V'] {
     arguments = ArrayList@1318[empty]
-    classifier = JavaTypeParameterImpl@1098['V']
+    classifier = JavaTypeParameterImpl@1152['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1319['V'] {
     arguments = ArrayList@1320[empty]
-    classifier = JavaTypeParameterImpl@1143['V']
+    classifier = JavaTypeParameterImpl@1179['V']
     nullable = 'true': Boolean@324
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
 
 LazyJavaClassifierType@1321['V'] {
     arguments = ArrayList@1322[empty]
-    classifier = JavaTypeParameterImpl@1116['V']
+    classifier = JavaTypeParameterImpl@1032['V']
     nullable = 'true': Boolean@324
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
 }
@@ -2741,16 +2741,16 @@ LazyJavaPackageFragment@1342['util'] {
     classes('HashMap': Name@1362) = LazyJavaClassDescriptor@107['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@1363
 }
 
-LazyJavaTypeParameterDescriptor@275['K'] {
+LazyJavaTypeParameterDescriptor@283['K'] {
     defaultType = JetTypeImpl@1364['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@537
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
     upperBounds = LinkedHashSet@1365[1] { NullableType@1366 }
     upperBoundsAsType = NullableType@1366
 }
 
-LazyJavaTypeParameterDescriptor@283['K'] {
+LazyJavaTypeParameterDescriptor@275['K'] {
     defaultType = JetTypeImpl@1367['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@533
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@543
     upperBounds = LinkedHashSet@1368[1] { NullableType@1369 }
     upperBoundsAsType = NullableType@1369
 }
@@ -2761,16 +2761,16 @@ LazyJavaTypeParameterDescriptor@280['K'] {
     upperBoundsAsType = NullableType@1372
 }
 
-LazyJavaTypeParameterDescriptor@276['V'] {
+LazyJavaTypeParameterDescriptor@284['V'] {
     defaultType = JetTypeImpl@1373['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1032
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
     upperBounds = LinkedHashSet@1374[1] { NullableType@1375 }
     upperBoundsAsType = NullableType@1375
 }
 
-LazyJavaTypeParameterDescriptor@284['V'] {
+LazyJavaTypeParameterDescriptor@276['V'] {
     defaultType = JetTypeImpl@1376['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1019
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@1029
     upperBounds = LinkedHashSet@1377[1] { NullableType@1378 }
     upperBoundsAsType = NullableType@1378
 }
@@ -2782,8 +2782,8 @@ LazyJavaTypeParameterDescriptor@281['V'] {
 }
 
 LazyJavaTypeParameterResolver@1382 {
-    resolve(JavaTypeParameterImpl@1383['K']) = LazyJavaTypeParameterDescriptor@280['K']
-    resolve(JavaTypeParameterImpl@1384['V']) = LazyJavaTypeParameterDescriptor@281['V']
+    resolve(JavaTypeParameterImpl@1383['K']) = LazyJavaTypeParameterDescriptor@275['K']
+    resolve(JavaTypeParameterImpl@1384['V']) = LazyJavaTypeParameterDescriptor@276['V']
 }
 
 LazyJavaTypeParameterResolver@1385 {
@@ -2792,129 +2792,134 @@ LazyJavaTypeParameterResolver@1385 {
 }
 
 LazyJavaTypeParameterResolver@1388 {
-    resolve(JavaTypeParameterImpl@1389['K']) = LazyJavaTypeParameterDescriptor@275['K']
-    resolve(JavaTypeParameterImpl@1390['V']) = LazyJavaTypeParameterDescriptor@276['V']
+    resolve(JavaTypeParameterImpl@1389['K']) = LazyJavaTypeParameterDescriptor@280['K']
+    resolve(JavaTypeParameterImpl@1390['V']) = LazyJavaTypeParameterDescriptor@281['V']
 }
 
 LazyJavaTypeParameterResolver@1391 {
-    resolve(JavaTypeParameterImpl@681['K']) = null
-    resolve(JavaTypeParameterImpl@1134['V']) = null
+    resolve(JavaTypeParameterImpl@687['K']) = null
+    resolve(JavaTypeParameterImpl@1140['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1392 {
-    resolve(JavaTypeParameterImpl@609['K']) = null
-    resolve(JavaTypeParameterImpl@1110['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1393 {
-    resolve(JavaTypeParameterImpl@660['K']) = null
-    resolve(JavaTypeParameterImpl@1080['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1394 {
-    resolve(JavaTypeParameterImpl@630['K']) = null
-    resolve(JavaTypeParameterImpl@1038['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1395 {
-    resolve(JavaTypeParameterImpl@624['K']) = null
-    resolve(JavaTypeParameterImpl@1173['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1396 {
-    resolve(JavaTypeParameterImpl@561['K']) = null
-    resolve(JavaTypeParameterImpl@1035['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1397 {
-    resolve(JavaTypeParameterImpl@612['K']) = null
-    resolve(JavaTypeParameterImpl@1083['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1398 {
-    resolve(JavaTypeParameterImpl@597['K']) = null
-    resolve(JavaTypeParameterImpl@1191['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1399 {
-    resolve(JavaTypeParameterImpl@536['K']) = null
-    resolve(JavaTypeParameterImpl@1179['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1400 {
     resolve(JavaTypeParameterImpl@567['K']) = null
-    resolve(JavaTypeParameterImpl@1128['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1401 {
-    resolve(JavaTypeParameterImpl@669['K']) = null
     resolve(JavaTypeParameterImpl@1056['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1402 {
+LazyJavaTypeParameterResolver@1393 {
     resolve(JavaTypeParameterImpl@627['K']) = null
-    resolve(JavaTypeParameterImpl@1065['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1403 {
-    resolve(JavaTypeParameterImpl@618['K']) = null
-    resolve(JavaTypeParameterImpl@1158['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1404 {
-    resolve(JavaTypeParameterImpl@582['K']) = null
-    resolve(JavaTypeParameterImpl@1047['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1405 {
-    resolve(JavaTypeParameterImpl@666['K']) = null
     resolve(JavaTypeParameterImpl@1028['V']) = null
 }
 
-LazyJavaTypeParameterResolver@1406 {
-    resolve(JavaTypeParameterImpl@573['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1407 {
-    resolve(JavaTypeParameterImpl@579['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1408 {
-    resolve(JavaTypeParameterImpl@678['K']) = null
-}
-
-LazyJavaTypeParameterResolver@1409 {
-    resolve(JavaTypeParameterImpl@1194['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1410 {
-    resolve(JavaTypeParameterImpl@1176['V']) = null
-}
-
-LazyJavaTypeParameterResolver@1411 {
+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@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@1185['V']) = null
+    resolve(JavaTypeParameterImpl@1059['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1413 {
-    resolve(JavaTypeParameterImpl@1125['V']) = null
+    resolve(JavaTypeParameterImpl@1086['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1414 {
-    resolve(JavaTypeParameterImpl@1143['V']) = null
+    resolve(JavaTypeParameterImpl@1134['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1415 {
-    resolve(JavaTypeParameterImpl@1071['V']) = null
+    resolve(JavaTypeParameterImpl@1146['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1416 {
-    resolve(JavaTypeParameterImpl@1098['V']) = null
+    resolve(JavaTypeParameterImpl@1197['V']) = null
 }
 
 LazyJavaTypeParameterResolver@1417 {
-    resolve(JavaTypeParameterImpl@1113['V']) = null
+    resolve(JavaTypeParameterImpl@1176['V']) = null
+}
+
+ResolutionTaskHolder@1418 {
+    <name not found> = ArrayList@1419[4] { ResolutionCandidate@1420, ResolutionCandidate@1421, ResolutionCandidate@1422, ... }
+    <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 b52cb3c9984..7c1bb40f915 100644
--- a/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
+++ b/compiler/testData/diagnostics/tests/recovery/absentLeftHandSide.lazy.log
@@ -18,34 +18,232 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('html': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('import': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('a': Name@16) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('html': Name@24) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('import': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('a': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('compareTo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('html': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('import': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('html': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('import': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('plus': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('a': Name@16) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('compareTo': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('html': Name@24) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('import': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('plus': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('a': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('compareTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('html': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('import': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('a': Name@16) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('compareTo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('html': Name@23) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('import': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+    <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 }
+    <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> = 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@52 {
+    <name not found> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { 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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@66 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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@68 {
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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 a5ef8798bdb..c3824f811cd 100644
--- a/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/recovery/namelessInJava.lazy.log
@@ -71,3 +71,11 @@ LazyJavaPackageFragment@52['p'] {
     classes('Int': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@67
     classes('Nameless': Name@58) = LazyJavaClassDescriptor@2['Nameless'] // through LazyPackageFragmentScopeForJavaPackage@67
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
index b17f6f784de..1951beb0249 100644
--- a/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
+++ b/compiler/testData/diagnostics/tests/redeclarations/SingletonAndFunctionSameName.lazy.log
@@ -37,3 +37,12 @@ LazyJavaPackageFragment@10['lang'] {
     functions('ENTRY': Name@14) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log b/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
index a05158e62ef..ef464b1abf8 100644
--- a/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/AmbiguityOnLazyTypeComputation.lazy.log
@@ -41,9 +41,28 @@ LazyJavaPackageFragment@10['java'] {
 LazyJavaPackageFragment@12['lang'] {
     classes('Foo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('b': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('compareTo': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
     functions('Foo': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('compareTo': Name@40) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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@49 {
+    <name not found> = ArrayList@50[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
+    <name not found> = ArrayList@53[2] { ResolutionCandidate@51, ResolutionCandidate@52 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log b/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
index dddb9ec02e1..23483efc67f 100644
--- a/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/AssignmentsUnderOperators.lazy.log
@@ -20,3 +20,28 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+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@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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
index 5fba0103222..60577a19490 100644
--- a/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/CoercionToUnit.lazy.log
@@ -35,3 +35,49 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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 421fcffba35..28d24de64d2 100644
--- a/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/DoubleDefine.lazy.log
@@ -10,2295 +10,2762 @@ LazyJavaClassDescriptor@1['AbstractCollection'] {
     functions('contains': Name@7) = ArrayList@8[1] { JavaMethodDescriptor@9['contains'] } // through LazyJavaClassMemberScope@6
     functions('remove': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['remove'] } // through LazyJavaClassMemberScope@6
     memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@6
-    properties('add': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@6
-    properties('contains': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@6
-    properties('remove': Name@17) = EmptyList@15[empty] // through LazyJavaClassMemberScope@6
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@20['AbstractList'] {
-    defaultType = JetTypeImpl@21['AbstractList<1>']
-    functions('add': Name@22) = ArrayList@23[2] { JavaMethodDescriptor@24['add'], JavaMethodDescriptor@25['add'] } // through LazyJavaClassMemberScope@26
-    functions('contains': Name@7) = ArrayList@27[1] { DeserializedSimpleFunctionDescriptor@28['contains'] } // through LazyJavaClassMemberScope@26
-    functions('remove': Name@29) = ArrayList@30[2] { JavaMethodDescriptor@31['remove'], DeserializedSimpleFunctionDescriptor@32['remove'] } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@26
-    properties('add': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@26
-    properties('contains': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@26
-    properties('remove': Name@17) = EmptyList@15[empty] // through LazyJavaClassMemberScope@26
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@34['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@35['AbstractList']
+LazyJavaClassDescriptor@16['AbstractList'] {
+    defaultType = JetTypeImpl@17['AbstractList<1>']
+    functions('add': Name@18) = ArrayList@19[2] { JavaMethodDescriptor@20['add'], JavaMethodDescriptor@21['add'] } // through LazyJavaClassMemberScope@22
+    functions('contains': Name@7) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['contains'] } // through LazyJavaClassMemberScope@22
+    functions('remove': Name@25) = ArrayList@26[2] { JavaMethodDescriptor@27['remove'], DeserializedSimpleFunctionDescriptor@28['remove'] } // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@22
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@30['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@31['AbstractList']
 }
 
-LazyJavaClassDescriptor@36['AbstractStringBuilder'] {
-    defaultType = JetTypeImpl@37['AbstractStringBuilder']
-    functions('append': Name@38) = ArrayList@39[13] { JavaMethodDescriptor@40['append'], JavaMethodDescriptor@41['append'], JavaMethodDescriptor@42['append'], ... } // through LazyJavaClassMemberScope@43
-    functions('charAt': Name@44) = ArrayList@45[1] { JavaMethodDescriptor@46['charAt'] } // through LazyJavaClassMemberScope@43
-    functions('deleteCharAt': Name@47) = ArrayList@48[1] { JavaMethodDescriptor@49['deleteCharAt'] } // through LazyJavaClassMemberScope@43
-    functions('length': Name@50) = ArrayList@51[1] { JavaMethodDescriptor@52['length'] } // through LazyJavaClassMemberScope@43
-    memberIndex = computeMemberIndex$1@53 // through LazyJavaClassMemberScope@43
-    properties('append': Name@54) = EmptyList@15[empty] // through LazyJavaClassMemberScope@43
-    properties('charAt': Name@44) = EmptyList@15[empty] // through LazyJavaClassMemberScope@43
-    properties('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyJavaClassMemberScope@43
-    properties('length': Name@50) = ArrayList@56[1] { DeserializedPropertyDescriptor@57['length'] } // through LazyJavaClassMemberScope@43
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@58['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassDescriptor@32['AbstractStringBuilder'] {
+    defaultType = JetTypeImpl@33['AbstractStringBuilder']
+    functions('append': Name@34) = ArrayList@35[13] { JavaMethodDescriptor@36['append'], JavaMethodDescriptor@37['append'], JavaMethodDescriptor@38['append'], ... } // through LazyJavaClassMemberScope@39
+    functions('charAt': Name@40) = ArrayList@41[1] { JavaMethodDescriptor@42['charAt'] } // through LazyJavaClassMemberScope@39
+    functions('deleteCharAt': Name@43) = ArrayList@44[1] { JavaMethodDescriptor@45['deleteCharAt'] } // through LazyJavaClassMemberScope@39
+    functions('length': Name@46) = ArrayList@47[1] { JavaMethodDescriptor@48['length'] } // through LazyJavaClassMemberScope@39
+    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@39
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@50['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@60['Appendable'] {
-    defaultType = JetTypeImpl@61['Appendable']
-    functions('append': Name@62) = ArrayList@63[3] { JavaMethodDescriptor@64['append'], JavaMethodDescriptor@65['append'], JavaMethodDescriptor@66['append'] } // through LazyJavaClassMemberScope@67
-    functions('charAt': Name@68) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    functions('deleteCharAt': Name@69) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    functions('length': Name@70) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    functions('println': Name@71) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    memberIndex = computeMemberIndex$1@72 // through LazyJavaClassMemberScope@67
-    properties('append': Name@54) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    properties('charAt': Name@44) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    properties('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    properties('length': Name@50) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    properties('println': Name@73) = EmptyList@15[empty] // through LazyJavaClassMemberScope@67
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@74['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassDescriptor@52['Appendable'] {
+    defaultType = JetTypeImpl@53['Appendable']
+    functions('append': Name@54) = ArrayList@55[3] { JavaMethodDescriptor@56['append'], JavaMethodDescriptor@57['append'], JavaMethodDescriptor@58['append'] } // through LazyJavaClassMemberScope@59
+    functions('charAt': Name@60) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
+    functions('deleteCharAt': Name@62) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
+    functions('length': Name@63) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
+    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@59
+    memberIndex = computeMemberIndex$1@65 // through LazyJavaClassMemberScope@59
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@66['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassDescriptor@76['ArrayList'] {
-    constructors = ArrayList@77[3] { JavaConstructorDescriptor@78['<init>'], JavaConstructorDescriptor@79['<init>'], JavaConstructorDescriptor@80['<init>'] } // through LazyJavaClassMemberScope@81
-    defaultType = JetTypeImpl@82['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@83 // through LazyJavaClassMemberScope@81
+LazyJavaClassDescriptor@68['ArrayList'] {
+    constructors = ArrayList@69[3] { JavaConstructorDescriptor@70['<init>'], JavaConstructorDescriptor@71['<init>'], JavaConstructorDescriptor@72['<init>'] } // through LazyJavaClassMemberScope@73
+    defaultType = JetTypeImpl@74['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@75 // through LazyJavaClassMemberScope@73
     functionTypeForSamInterface = null
-    functions('add': Name@14) = ArrayList@84[2] { JavaMethodDescriptor@85['add'], JavaMethodDescriptor@86['add'] } // through LazyJavaClassMemberScope@81
-    functions('contains': Name@16) = ArrayList@87[1] { JavaMethodDescriptor@88['contains'] } // through LazyJavaClassMemberScope@81
-    functions('remove': Name@17) = ArrayList@89[2] { JavaMethodDescriptor@90['remove'], JavaMethodDescriptor@91['remove'] } // through LazyJavaClassMemberScope@81
-    memberIndex = computeMemberIndex$1@92 // through LazyJavaClassMemberScope@81
-    nestedClassIndex = LinkedHashMap@93 // through LazyJavaClassMemberScope@81
-    nestedClasses('add': Name@14) = null // through LazyJavaClassMemberScope@81
-    nestedClasses('contains': Name@16) = null // through LazyJavaClassMemberScope@81
-    nestedClasses('remove': Name@17) = null // through LazyJavaClassMemberScope@81
-    properties('add': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@81
-    properties('contains': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@81
-    properties('remove': Name@17) = EmptyList@15[empty] // through LazyJavaClassMemberScope@81
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@94['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@95['ArrayList']
+    functions('add': Name@76) = ArrayList@77[2] { JavaMethodDescriptor@78['add'], JavaMethodDescriptor@79['add'] } // through LazyJavaClassMemberScope@73
+    functions('contains': Name@80) = ArrayList@81[1] { JavaMethodDescriptor@82['contains'] } // through LazyJavaClassMemberScope@73
+    functions('remove': Name@83) = ArrayList@84[2] { JavaMethodDescriptor@85['remove'], JavaMethodDescriptor@86['remove'] } // through LazyJavaClassMemberScope@73
+    memberIndex = computeMemberIndex$1@87 // through LazyJavaClassMemberScope@73
+    nestedClassIndex = LinkedHashMap@88 // through LazyJavaClassMemberScope@73
+    nestedClasses('add': Name@76) = null // through LazyJavaClassMemberScope@73
+    nestedClasses('contains': Name@80) = null // through LazyJavaClassMemberScope@73
+    nestedClasses('remove': Name@83) = null // through LazyJavaClassMemberScope@73
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@89['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@90['ArrayList']
 }
 
-LazyJavaClassDescriptor@96['AutoCloseable'] {
-    functions('println': Name@71) = EmptyList@15[empty] // through LazyJavaClassMemberScope@97
-    functions('readLine': Name@98) = EmptyList@15[empty] // through LazyJavaClassMemberScope@97
-    memberIndex = computeMemberIndex$1@99 // through LazyJavaClassMemberScope@97
-    properties('println': Name@73) = EmptyList@15[empty] // through LazyJavaClassMemberScope@97
-    properties('readLine': Name@100) = EmptyList@15[empty] // through LazyJavaClassMemberScope@97
-    typeConstructor = LazyJavaClassTypeConstructor@101['AutoCloseable']
+LazyJavaClassDescriptor@91['AutoCloseable'] {
+    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@92
+    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@92
+    memberIndex = computeMemberIndex$1@94 // through LazyJavaClassMemberScope@92
+    typeConstructor = LazyJavaClassTypeConstructor@95['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@102['BufferedReader'] {
-    constructors = ArrayList@103[2] { JavaConstructorDescriptor@104['<init>'], JavaConstructorDescriptor@105['<init>'] } // through LazyJavaClassMemberScope@106
-    defaultType = JetTypeImpl@107['BufferedReader']
-    enumEntryIndex = LinkedHashMap@108 // through LazyJavaClassMemberScope@106
+LazyJavaClassDescriptor@96['BufferedReader'] {
+    constructors = ArrayList@97[2] { JavaConstructorDescriptor@98['<init>'], JavaConstructorDescriptor@99['<init>'] } // through LazyJavaClassMemberScope@100
+    defaultType = JetTypeImpl@101['BufferedReader']
+    enumEntryIndex = LinkedHashMap@102 // through LazyJavaClassMemberScope@100
     functionTypeForSamInterface = null
-    functions('readLine': Name@100) = ArrayList@109[2] { JavaMethodDescriptor@110['readLine'], JavaMethodDescriptor@111['readLine'] } // through LazyJavaClassMemberScope@106
-    memberIndex = computeMemberIndex$1@112 // through LazyJavaClassMemberScope@106
-    nestedClassIndex = LinkedHashMap@113 // through LazyJavaClassMemberScope@106
-    nestedClasses('readLine': Name@100) = null // through LazyJavaClassMemberScope@106
-    properties('readLine': Name@100) = EmptyList@15[empty] // through LazyJavaClassMemberScope@106
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@114['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@115['BufferedReader']
+    functions('readLine': Name@103) = ArrayList@104[2] { JavaMethodDescriptor@105['readLine'], JavaMethodDescriptor@106['readLine'] } // through LazyJavaClassMemberScope@100
+    memberIndex = computeMemberIndex$1@107 // through LazyJavaClassMemberScope@100
+    nestedClassIndex = LinkedHashMap@108 // through LazyJavaClassMemberScope@100
+    nestedClasses('readLine': Name@103) = null // through LazyJavaClassMemberScope@100
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@109['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@110['BufferedReader']
 }
 
-LazyJavaClassDescriptor@116['Charset'] {
+LazyJavaClassDescriptor@111['Charset'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@117['Charset']
+    typeConstructor = LazyJavaClassTypeConstructor@112['Charset']
 }
 
-LazyJavaClassDescriptor@118['Closeable'] {
-    functions('println': Name@71) = EmptyList@15[empty] // through LazyJavaClassMemberScope@119
-    functions('readLine': Name@98) = EmptyList@15[empty] // through LazyJavaClassMemberScope@119
-    memberIndex = computeMemberIndex$1@120 // through LazyJavaClassMemberScope@119
-    properties('println': Name@73) = EmptyList@15[empty] // through LazyJavaClassMemberScope@119
-    properties('readLine': Name@100) = EmptyList@15[empty] // through LazyJavaClassMemberScope@119
-    typeConstructor = LazyJavaClassTypeConstructor@121['Closeable']
+LazyJavaClassDescriptor@113['Closeable'] {
+    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@114
+    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@114
+    memberIndex = computeMemberIndex$1@115 // through LazyJavaClassMemberScope@114
+    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
 }
 
-LazyJavaClassDescriptor@122['Exception'] {
-    constructors = ArrayList@123[5] { JavaConstructorDescriptor@124['<init>'], JavaConstructorDescriptor@125['<init>'], JavaConstructorDescriptor@126['<init>'], ... } // through LazyJavaClassMemberScope@127
-    defaultType = JetTypeImpl@128['Exception']
+LazyJavaClassDescriptor@117['Exception'] {
+    constructors = ArrayList@118[5] { JavaConstructorDescriptor@119['<init>'], JavaConstructorDescriptor@120['<init>'], JavaConstructorDescriptor@121['<init>'], ... } // through LazyJavaClassMemberScope@122
+    defaultType = JetTypeImpl@123['Exception']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@129['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@124['Exception']
 }
 
-LazyJavaClassDescriptor@130['FilterOutputStream'] {
-    functions('println': Name@71) = EmptyList@15[empty] // through LazyJavaClassMemberScope@131
-    memberIndex = computeMemberIndex$1@132 // through LazyJavaClassMemberScope@131
-    properties('println': Name@73) = EmptyList@15[empty] // through LazyJavaClassMemberScope@131
-    typeConstructor = LazyJavaClassTypeConstructor@133['FilterOutputStream']
+LazyJavaClassDescriptor@125['FilterOutputStream'] {
+    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@126
+    memberIndex = computeMemberIndex$1@127 // through LazyJavaClassMemberScope@126
+    typeConstructor = LazyJavaClassTypeConstructor@128['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@134['InputStream'] {
+LazyJavaClassDescriptor@129['InputStream'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
-LazyJavaClassDescriptor@136['InputStreamReader'] {
-    constructors = ArrayList@137[4] { JavaConstructorDescriptor@138['<init>'], JavaConstructorDescriptor@139['<init>'], JavaConstructorDescriptor@140['<init>'], ... } // through LazyJavaClassMemberScope@141
-    defaultType = JetTypeImpl@142['InputStreamReader']
+LazyJavaClassDescriptor@131['InputStreamReader'] {
+    constructors = ArrayList@132[4] { JavaConstructorDescriptor@133['<init>'], JavaConstructorDescriptor@134['<init>'], JavaConstructorDescriptor@135['<init>'], ... } // through LazyJavaClassMemberScope@136
+    defaultType = JetTypeImpl@137['InputStreamReader']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@143['InputStreamReader']
+    typeConstructor = LazyJavaClassTypeConstructor@138['InputStreamReader']
 }
 
-LazyJavaClassDescriptor@144['OutputStream'] {
-    functions('println': Name@71) = EmptyList@15[empty] // through LazyJavaClassMemberScope@145
-    memberIndex = computeMemberIndex$1@146 // through LazyJavaClassMemberScope@145
-    properties('println': Name@73) = EmptyList@15[empty] // through LazyJavaClassMemberScope@145
-    typeConstructor = LazyJavaClassTypeConstructor@147['OutputStream']
+LazyJavaClassDescriptor@139['OutputStream'] {
+    functions('println': Name@64) = EmptyList@61[empty] // through LazyJavaClassMemberScope@140
+    memberIndex = computeMemberIndex$1@141 // through LazyJavaClassMemberScope@140
+    typeConstructor = LazyJavaClassTypeConstructor@142['OutputStream']
 }
 
-LazyJavaClassDescriptor@148['PrintStream'] {
-    defaultType = JetTypeImpl@149['PrintStream']
-    enumEntryIndex = LinkedHashMap@150 // through LazyJavaClassMemberScope@151
-    functions('println': Name@73) = ArrayList@152[10] { JavaMethodDescriptor@153['println'], JavaMethodDescriptor@154['println'], JavaMethodDescriptor@155['println'], ... } // through LazyJavaClassMemberScope@151
-    memberIndex = computeMemberIndex$1@156 // through LazyJavaClassMemberScope@151
-    nestedClassIndex = LinkedHashMap@157 // through LazyJavaClassMemberScope@151
-    nestedClasses('println': Name@73) = null // through LazyJavaClassMemberScope@151
-    properties('println': Name@73) = EmptyList@15[empty] // through LazyJavaClassMemberScope@151
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@158['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@159['PrintStream']
+LazyJavaClassDescriptor@143['PrintStream'] {
+    defaultType = JetTypeImpl@144['PrintStream']
+    enumEntryIndex = LinkedHashMap@145 // through LazyJavaClassMemberScope@146
+    functions('println': Name@147) = ArrayList@148[10] { JavaMethodDescriptor@149['println'], JavaMethodDescriptor@150['println'], JavaMethodDescriptor@151['println'], ... } // through LazyJavaClassMemberScope@146
+    memberIndex = computeMemberIndex$1@152 // through LazyJavaClassMemberScope@146
+    nestedClassIndex = LinkedHashMap@153 // through LazyJavaClassMemberScope@146
+    nestedClasses('println': Name@147) = null // through LazyJavaClassMemberScope@146
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@154['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@155['PrintStream']
 }
 
-LazyJavaClassDescriptor@160['Random'] {
-    constructors = ArrayList@161[2] { JavaConstructorDescriptor@162['<init>'], JavaConstructorDescriptor@163['<init>'] } // through LazyJavaClassMemberScope@164
-    defaultType = JetTypeImpl@165['Random']
-    enumEntryIndex = LinkedHashMap@166 // through LazyJavaClassMemberScope@164
+LazyJavaClassDescriptor@156['Random'] {
+    constructors = ArrayList@157[2] { JavaConstructorDescriptor@158['<init>'], JavaConstructorDescriptor@159['<init>'] } // through LazyJavaClassMemberScope@160
+    defaultType = JetTypeImpl@161['Random']
+    enumEntryIndex = LinkedHashMap@162 // through LazyJavaClassMemberScope@160
     functionTypeForSamInterface = null
-    functions('nextInt': Name@167) = ArrayList@168[2] { JavaMethodDescriptor@169['nextInt'], JavaMethodDescriptor@170['nextInt'] } // through LazyJavaClassMemberScope@164
-    memberIndex = computeMemberIndex$1@171 // through LazyJavaClassMemberScope@164
-    nestedClassIndex = LinkedHashMap@172 // through LazyJavaClassMemberScope@164
-    nestedClasses('nextInt': Name@167) = null // through LazyJavaClassMemberScope@164
-    properties('nextInt': Name@167) = EmptyList@15[empty] // through LazyJavaClassMemberScope@164
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@173['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@174['Random']
+    functions('nextInt': Name@163) = ArrayList@164[2] { JavaMethodDescriptor@165['nextInt'], JavaMethodDescriptor@166['nextInt'] } // through LazyJavaClassMemberScope@160
+    memberIndex = computeMemberIndex$1@167 // through LazyJavaClassMemberScope@160
+    nestedClassIndex = LinkedHashMap@168 // through LazyJavaClassMemberScope@160
+    nestedClasses('nextInt': Name@163) = null // through LazyJavaClassMemberScope@160
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@169['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@170['Random']
 }
 
-LazyJavaClassDescriptor@175['RandomAccess'] {
-    functions('add': Name@22) = EmptyList@15[empty] // through LazyJavaClassMemberScope@176
-    functions('contains': Name@7) = EmptyList@15[empty] // through LazyJavaClassMemberScope@176
-    functions('remove': Name@29) = EmptyList@15[empty] // through LazyJavaClassMemberScope@176
+LazyJavaClassDescriptor@171['RandomAccess'] {
+    functions('add': Name@18) = EmptyList@61[empty] // through LazyJavaClassMemberScope@172
+    functions('contains': Name@7) = EmptyList@61[empty] // through LazyJavaClassMemberScope@172
+    functions('remove': Name@25) = EmptyList@61[empty] // through LazyJavaClassMemberScope@172
+    memberIndex = computeMemberIndex$1@173 // through LazyJavaClassMemberScope@172
+    typeConstructor = LazyJavaClassTypeConstructor@174['RandomAccess']
+}
+
+LazyJavaClassDescriptor@175['Readable'] {
+    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@176
     memberIndex = computeMemberIndex$1@177 // through LazyJavaClassMemberScope@176
-    properties('add': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@176
-    properties('contains': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@176
-    properties('remove': Name@17) = EmptyList@15[empty] // through LazyJavaClassMemberScope@176
-    typeConstructor = LazyJavaClassTypeConstructor@178['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@178['Readable']
 }
 
-LazyJavaClassDescriptor@179['Readable'] {
-    functions('readLine': Name@98) = EmptyList@15[empty] // through LazyJavaClassMemberScope@180
+LazyJavaClassDescriptor@179['Reader'] {
+    functionTypeForSamInterface = null
+    functions('readLine': Name@93) = EmptyList@61[empty] // through LazyJavaClassMemberScope@180
     memberIndex = computeMemberIndex$1@181 // through LazyJavaClassMemberScope@180
-    properties('readLine': Name@100) = EmptyList@15[empty] // through LazyJavaClassMemberScope@180
-    typeConstructor = LazyJavaClassTypeConstructor@182['Readable']
+    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
-LazyJavaClassDescriptor@183['Reader'] {
+LazyJavaClassDescriptor@183['Serializable'] {
+    functions('add': Name@18) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    functions('append': Name@34) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    functions('charAt': Name@40) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    functions('contains': Name@7) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    functions('deleteCharAt': Name@43) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    functions('length': Name@46) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    functions('nextInt': Name@185) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    functions('remove': Name@25) = EmptyList@61[empty] // through LazyJavaClassMemberScope@184
+    memberIndex = computeMemberIndex$1@186 // through LazyJavaClassMemberScope@184
+    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
+}
+
+LazyJavaClassDescriptor@188['StringBuffer'] {
     functionTypeForSamInterface = null
-    functions('readLine': Name@98) = EmptyList@15[empty] // through LazyJavaClassMemberScope@184
-    memberIndex = computeMemberIndex$1@185 // through LazyJavaClassMemberScope@184
-    properties('readLine': Name@100) = EmptyList@15[empty] // through LazyJavaClassMemberScope@184
-    typeConstructor = LazyJavaClassTypeConstructor@186['Reader']
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
 }
 
-LazyJavaClassDescriptor@187['Serializable'] {
-    functions('add': Name@22) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    functions('append': Name@38) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    functions('charAt': Name@44) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    functions('contains': Name@7) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    functions('deleteCharAt': Name@47) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    functions('length': Name@50) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    functions('nextInt': Name@189) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    functions('remove': Name@29) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    memberIndex = computeMemberIndex$1@190 // through LazyJavaClassMemberScope@188
-    properties('add': Name@14) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    properties('append': Name@54) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    properties('charAt': Name@44) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    properties('contains': Name@16) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    properties('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    properties('length': Name@50) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    properties('nextInt': Name@167) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    properties('remove': Name@17) = EmptyList@15[empty] // through LazyJavaClassMemberScope@188
-    typeConstructor = LazyJavaClassTypeConstructor@191['Serializable']
-}
-
-LazyJavaClassDescriptor@192['StringBuffer'] {
+LazyJavaClassDescriptor@190['StringBuilder'] {
+    constructors = ArrayList@191[4] { JavaConstructorDescriptor@192['<init>'], JavaConstructorDescriptor@193['<init>'], JavaConstructorDescriptor@194['<init>'], ... } // through LazyJavaClassMemberScope@195
+    defaultType = JetTypeImpl@196['StringBuilder']
+    enumEntryIndex = LinkedHashMap@197 // through LazyJavaClassMemberScope@195
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuffer']
+    functions('append': Name@198) = ArrayList@199[14] { JavaMethodDescriptor@200['append'], JavaMethodDescriptor@201['append'], JavaMethodDescriptor@202['append'], ... } // through LazyJavaClassMemberScope@195
+    functions('charAt': Name@40) = ArrayList@203[1] { JavaMethodDescriptor@204['charAt'] } // through LazyJavaClassMemberScope@195
+    functions('deleteCharAt': Name@205) = ArrayList@206[1] { JavaMethodDescriptor@207['deleteCharAt'] } // through LazyJavaClassMemberScope@195
+    functions('length': Name@46) = ArrayList@208[1] { JavaMethodDescriptor@209['length'] } // through LazyJavaClassMemberScope@195
+    memberIndex = computeMemberIndex$1@210 // through LazyJavaClassMemberScope@195
+    nestedClassIndex = LinkedHashMap@211 // through LazyJavaClassMemberScope@195
+    nestedClasses('append': Name@198) = null // through LazyJavaClassMemberScope@195
+    nestedClasses('charAt': Name@40) = null // through LazyJavaClassMemberScope@195
+    nestedClasses('deleteCharAt': Name@205) = null // through LazyJavaClassMemberScope@195
+    nestedClasses('length': Name@46) = null // through LazyJavaClassMemberScope@195
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@212['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassDescriptor@194['StringBuilder'] {
-    constructors = ArrayList@195[4] { JavaConstructorDescriptor@196['<init>'], JavaConstructorDescriptor@197['<init>'], JavaConstructorDescriptor@198['<init>'], ... } // through LazyJavaClassMemberScope@199
-    defaultType = JetTypeImpl@200['StringBuilder']
-    enumEntryIndex = LinkedHashMap@201 // through LazyJavaClassMemberScope@199
-    functionTypeForSamInterface = null
-    functions('append': Name@54) = ArrayList@202[14] { JavaMethodDescriptor@203['append'], JavaMethodDescriptor@204['append'], JavaMethodDescriptor@205['append'], ... } // through LazyJavaClassMemberScope@199
-    functions('charAt': Name@44) = ArrayList@206[1] { JavaMethodDescriptor@207['charAt'] } // through LazyJavaClassMemberScope@199
-    functions('deleteCharAt': Name@55) = ArrayList@208[1] { JavaMethodDescriptor@209['deleteCharAt'] } // through LazyJavaClassMemberScope@199
-    functions('length': Name@50) = ArrayList@210[1] { JavaMethodDescriptor@211['length'] } // through LazyJavaClassMemberScope@199
-    memberIndex = computeMemberIndex$1@212 // through LazyJavaClassMemberScope@199
-    nestedClassIndex = LinkedHashMap@213 // through LazyJavaClassMemberScope@199
-    nestedClasses('append': Name@54) = null // through LazyJavaClassMemberScope@199
-    nestedClasses('charAt': Name@44) = null // through LazyJavaClassMemberScope@199
-    nestedClasses('deleteCharAt': Name@55) = null // through LazyJavaClassMemberScope@199
-    nestedClasses('length': Name@50) = null // through LazyJavaClassMemberScope@199
-    properties('append': Name@54) = EmptyList@15[empty] // through LazyJavaClassMemberScope@199
-    properties('charAt': Name@44) = EmptyList@15[empty] // through LazyJavaClassMemberScope@199
-    properties('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyJavaClassMemberScope@199
-    properties('length': Name@50) = ArrayList@214[1] { DeserializedPropertyDescriptor@215['length'] } // through LazyJavaClassMemberScope@199
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@216['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassDescriptor@214['System'] {
+    enumEntryIndex = LinkedHashMap@215 // through LazyJavaClassMemberScope@216
+    memberIndex = computeMemberIndex$1@217 // through LazyJavaClassMemberScope@216
+    memberIndex = computeMemberIndex$1@218 // through LazyJavaStaticClassScope@219
+    nestedClassIndex = LinkedHashMap@220 // through LazyJavaClassMemberScope@216
+    nestedClasses('in': Name@221) = null // through LazyJavaClassMemberScope@216
+    nestedClasses('out': Name@222) = null // through LazyJavaClassMemberScope@216
+    properties('in': Name@221) = ArrayList@223[1] { JavaPropertyDescriptor@224['in'] } // through LazyJavaStaticClassScope@219
+    properties('in': Name@221) = EmptyList@61[empty] // through LazyJavaClassMemberScope@216
+    properties('out': Name@222) = ArrayList@225[1] { JavaPropertyDescriptor@226['out'] } // through LazyJavaStaticClassScope@219
+    properties('out': Name@222) = EmptyList@61[empty] // through LazyJavaClassMemberScope@216
+    typeConstructor = LazyJavaClassTypeConstructor@227['System']
 }
 
-LazyJavaClassDescriptor@218['System'] {
-    enumEntryIndex = LinkedHashMap@219 // through LazyJavaClassMemberScope@220
-    memberIndex = computeMemberIndex$1@221 // through LazyJavaClassMemberScope@220
-    memberIndex = computeMemberIndex$1@222 // through LazyJavaStaticClassScope@223
-    nestedClassIndex = LinkedHashMap@224 // through LazyJavaClassMemberScope@220
-    nestedClasses('in': Name@225) = null // through LazyJavaClassMemberScope@220
-    nestedClasses('out': Name@226) = null // through LazyJavaClassMemberScope@220
-    properties('in': Name@225) = ArrayList@227[1] { JavaPropertyDescriptor@228['in'] } // through LazyJavaStaticClassScope@223
-    properties('in': Name@225) = EmptyList@15[empty] // through LazyJavaClassMemberScope@220
-    properties('out': Name@226) = ArrayList@229[1] { JavaPropertyDescriptor@230['out'] } // through LazyJavaStaticClassScope@223
-    properties('out': Name@226) = EmptyList@15[empty] // through LazyJavaClassMemberScope@220
-    typeConstructor = LazyJavaClassTypeConstructor@231['System']
+LazyJavaClassTypeConstructor@15['AbstractCollection'] {
+    parameters = ArrayList@228[1] { LazyJavaTypeParameterDescriptor@229['E'] }
+    supertypes = ArrayList@230[1] { LazyJavaClassifierType@231['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@19['AbstractCollection'] {
+LazyJavaClassTypeConstructor@31['AbstractList'] {
     parameters = ArrayList@232[1] { LazyJavaTypeParameterDescriptor@233['E'] }
-    supertypes = ArrayList@234[1] { LazyJavaClassifierType@235['Collection<E>'] }
+    supertypes = ArrayList@234[2] { LazyJavaClassifierType@235['AbstractCollection<E>'], LazyJavaClassifierType@236['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@35['AbstractList'] {
-    parameters = ArrayList@236[1] { LazyJavaTypeParameterDescriptor@237['E'] }
-    supertypes = ArrayList@238[2] { LazyJavaClassifierType@239['AbstractCollection<E>'], LazyJavaClassifierType@240['List<E>'] }
+LazyJavaClassTypeConstructor@51['AbstractStringBuilder'] {
+    parameters = ArrayList@237[empty]
+    supertypes = ArrayList@238[2] { LazyJavaClassifierType@239['Appendable'], LazyJavaClassifierType@240['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@59['AbstractStringBuilder'] {
+LazyJavaClassTypeConstructor@67['Appendable'] {
     parameters = ArrayList@241[empty]
-    supertypes = ArrayList@242[2] { LazyJavaClassifierType@243['Appendable'], LazyJavaClassifierType@244['CharSequence'] }
+    supertypes = ArrayList@242[1] { JetTypeImpl@243['Any'] }
 }
 
-LazyJavaClassTypeConstructor@75['Appendable'] {
-    parameters = ArrayList@245[empty]
-    supertypes = ArrayList@246[1] { JetTypeImpl@247['Any'] }
+LazyJavaClassTypeConstructor@90['ArrayList'] {
+    parameters = ArrayList@244[1] { LazyJavaTypeParameterDescriptor@245['E'] }
+    supertypes = ArrayList@246[5] { LazyJavaClassifierType@247['AbstractList<E>'], LazyJavaClassifierType@248['List<E>'], LazyJavaClassifierType@249['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@95['ArrayList'] {
-    parameters = ArrayList@248[1] { LazyJavaTypeParameterDescriptor@249['E'] }
-    supertypes = ArrayList@250[5] { LazyJavaClassifierType@251['AbstractList<E>'], LazyJavaClassifierType@252['List<E>'], LazyJavaClassifierType@253['RandomAccess'], ... }
+LazyJavaClassTypeConstructor@95['AutoCloseable'] {
+    parameters = ArrayList@250[empty]
+    supertypes = ArrayList@251[1] { JetTypeImpl@243['Any'] }
 }
 
-LazyJavaClassTypeConstructor@101['AutoCloseable'] {
-    parameters = ArrayList@254[empty]
-    supertypes = ArrayList@255[1] { JetTypeImpl@247['Any'] }
+LazyJavaClassTypeConstructor@110['BufferedReader'] {
+    parameters = ArrayList@252[empty]
+    supertypes = ArrayList@253[1] { LazyJavaClassifierType@254['Reader'] }
 }
 
-LazyJavaClassTypeConstructor@115['BufferedReader'] {
+LazyJavaClassTypeConstructor@112['Charset'] {
+    parameters = ArrayList@255[empty]
+}
+
+LazyJavaClassTypeConstructor@116['Closeable'] {
     parameters = ArrayList@256[empty]
-    supertypes = ArrayList@257[1] { LazyJavaClassifierType@258['Reader'] }
+    supertypes = ArrayList@257[1] { LazyJavaClassifierType@258['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@117['Charset'] {
+LazyJavaClassTypeConstructor@124['Exception'] {
     parameters = ArrayList@259[empty]
+    supertypes = ArrayList@260[1] { LazyJavaClassifierType@261['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@121['Closeable'] {
-    parameters = ArrayList@260[empty]
-    supertypes = ArrayList@261[1] { LazyJavaClassifierType@262['AutoCloseable'] }
+LazyJavaClassTypeConstructor@128['FilterOutputStream'] {
+    parameters = ArrayList@262[empty]
+    supertypes = ArrayList@263[1] { LazyJavaClassifierType@264['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@129['Exception'] {
-    parameters = ArrayList@263[empty]
-    supertypes = ArrayList@264[1] { LazyJavaClassifierType@265['Throwable'] }
+LazyJavaClassTypeConstructor@130['InputStream'] {
+    parameters = ArrayList@265[empty]
+    supertypes = ArrayList@266[1] { LazyJavaClassifierType@267['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@133['FilterOutputStream'] {
-    parameters = ArrayList@266[empty]
-    supertypes = ArrayList@267[1] { LazyJavaClassifierType@268['OutputStream'] }
+LazyJavaClassTypeConstructor@138['InputStreamReader'] {
+    parameters = ArrayList@268[empty]
+    supertypes = ArrayList@269[1] { LazyJavaClassifierType@270['Reader'] }
 }
 
-LazyJavaClassTypeConstructor@135['InputStream'] {
-    parameters = ArrayList@269[empty]
-    supertypes = ArrayList@270[1] { LazyJavaClassifierType@271['Closeable'] }
+LazyJavaClassTypeConstructor@142['OutputStream'] {
+    parameters = ArrayList@271[empty]
+    supertypes = ArrayList@272[1] { LazyJavaClassifierType@273['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@143['InputStreamReader'] {
-    parameters = ArrayList@272[empty]
-    supertypes = ArrayList@273[1] { LazyJavaClassifierType@274['Reader'] }
+LazyJavaClassTypeConstructor@155['PrintStream'] {
+    parameters = ArrayList@274[empty]
+    supertypes = ArrayList@275[3] { LazyJavaClassifierType@276['FilterOutputStream'], LazyJavaClassifierType@277['Appendable'], LazyJavaClassifierType@278['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@147['OutputStream'] {
-    parameters = ArrayList@275[empty]
-    supertypes = ArrayList@276[1] { LazyJavaClassifierType@277['Closeable'] }
+LazyJavaClassTypeConstructor@170['Random'] {
+    parameters = ArrayList@279[empty]
+    supertypes = ArrayList@280[1] { LazyJavaClassifierType@281['Serializable'] }
 }
 
-LazyJavaClassTypeConstructor@159['PrintStream'] {
-    parameters = ArrayList@278[empty]
-    supertypes = ArrayList@279[3] { LazyJavaClassifierType@280['FilterOutputStream'], LazyJavaClassifierType@281['Appendable'], LazyJavaClassifierType@282['Closeable'] }
+LazyJavaClassTypeConstructor@174['RandomAccess'] {
+    parameters = ArrayList@282[empty]
+    supertypes = ArrayList@283[1] { JetTypeImpl@243['Any'] }
 }
 
-LazyJavaClassTypeConstructor@174['Random'] {
-    parameters = ArrayList@283[empty]
-    supertypes = ArrayList@284[1] { LazyJavaClassifierType@285['Serializable'] }
+LazyJavaClassTypeConstructor@178['Readable'] {
+    parameters = ArrayList@284[empty]
+    supertypes = ArrayList@285[1] { JetTypeImpl@243['Any'] }
 }
 
-LazyJavaClassTypeConstructor@178['RandomAccess'] {
+LazyJavaClassTypeConstructor@182['Reader'] {
     parameters = ArrayList@286[empty]
-    supertypes = ArrayList@287[1] { JetTypeImpl@247['Any'] }
+    supertypes = ArrayList@287[2] { LazyJavaClassifierType@288['Readable'], LazyJavaClassifierType@289['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@182['Readable'] {
-    parameters = ArrayList@288[empty]
-    supertypes = ArrayList@289[1] { JetTypeImpl@247['Any'] }
-}
-
-LazyJavaClassTypeConstructor@186['Reader'] {
+LazyJavaClassTypeConstructor@187['Serializable'] {
     parameters = ArrayList@290[empty]
-    supertypes = ArrayList@291[2] { LazyJavaClassifierType@292['Readable'], LazyJavaClassifierType@293['Closeable'] }
+    supertypes = ArrayList@291[1] { JetTypeImpl@243['Any'] }
 }
 
-LazyJavaClassTypeConstructor@191['Serializable'] {
-    parameters = ArrayList@294[empty]
-    supertypes = ArrayList@295[1] { JetTypeImpl@247['Any'] }
+LazyJavaClassTypeConstructor@189['StringBuffer'] {
+    parameters = ArrayList@292[empty]
+    supertypes = ArrayList@293[3] { LazyJavaClassifierType@294['AbstractStringBuilder'], LazyJavaClassifierType@295['Serializable'], LazyJavaClassifierType@296['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@193['StringBuffer'] {
-    parameters = ArrayList@296[empty]
-    supertypes = ArrayList@297[3] { LazyJavaClassifierType@298['AbstractStringBuilder'], LazyJavaClassifierType@299['Serializable'], LazyJavaClassifierType@300['CharSequence'] }
+LazyJavaClassTypeConstructor@213['StringBuilder'] {
+    parameters = ArrayList@297[empty]
+    supertypes = ArrayList@298[3] { LazyJavaClassifierType@299['AbstractStringBuilder'], LazyJavaClassifierType@300['Serializable'], LazyJavaClassifierType@301['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@217['StringBuilder'] {
-    parameters = ArrayList@301[empty]
-    supertypes = ArrayList@302[3] { LazyJavaClassifierType@303['AbstractStringBuilder'], LazyJavaClassifierType@304['Serializable'], LazyJavaClassifierType@305['CharSequence'] }
+LazyJavaClassTypeConstructor@227['System'] {
+    supertypes = ArrayList@302[1] { JetTypeImpl@243['Any'] }
 }
 
-LazyJavaClassTypeConstructor@231['System'] {
-    supertypes = ArrayList@306[1] { JetTypeImpl@247['Any'] }
+LazyJavaClassifierType@235['AbstractCollection<E>'] {
+    arguments = ArrayList@303[1] { TypeProjectionImpl@304 }
+    classifier = JavaClassImpl@305['AbstractCollection']
+    memberScope = SubstitutingScope@306
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@15['AbstractCollection']
 }
 
-LazyJavaClassifierType@239['AbstractCollection<E>'] {
-    arguments = ArrayList@307[1] { TypeProjectionImpl@308 }
-    classifier = JavaClassImpl@309['AbstractCollection']
-    memberScope = SubstitutingScope@310
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractCollection']
+LazyJavaClassifierType@247['AbstractList<E>'] {
+    arguments = ArrayList@308[1] { TypeProjectionImpl@309 }
+    classifier = JavaClassImpl@310['AbstractList']
+    memberScope = SubstitutingScope@311
+    typeConstructor = LazyJavaClassTypeConstructor@31['AbstractList']
 }
 
-LazyJavaClassifierType@251['AbstractList<E>'] {
-    arguments = ArrayList@312[1] { TypeProjectionImpl@313 }
-    classifier = JavaClassImpl@314['AbstractList']
-    memberScope = SubstitutingScope@315
-    typeConstructor = LazyJavaClassTypeConstructor@35['AbstractList']
+LazyJavaClassifierType@299['AbstractStringBuilder'] {
+    arguments = ArrayList@312[empty]
+    classifier = JavaClassImpl@313['AbstractStringBuilder']
+    memberScope = LazyJavaClassMemberScope@39
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@303['AbstractStringBuilder'] {
-    arguments = ArrayList@316[empty]
-    classifier = JavaClassImpl@317['AbstractStringBuilder']
-    memberScope = LazyJavaClassMemberScope@43
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@314['AbstractStringBuilder'] {
+    arguments = ArrayList@315[empty]
+    classifier = JavaClassImpl@316['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@318['AbstractStringBuilder'] {
-    arguments = ArrayList@319[empty]
-    classifier = JavaClassImpl@320['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@317['AbstractStringBuilder'] {
+    arguments = ArrayList@318[empty]
+    classifier = JavaClassImpl@319['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@321['AbstractStringBuilder'] {
-    arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@323['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@320['AbstractStringBuilder'] {
+    arguments = ArrayList@321[empty]
+    classifier = JavaClassImpl@322['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@324['AbstractStringBuilder'] {
-    arguments = ArrayList@325[empty]
-    classifier = JavaClassImpl@326['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@323['AbstractStringBuilder'] {
+    arguments = ArrayList@324[empty]
+    classifier = JavaClassImpl@325['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@327['AbstractStringBuilder'] {
-    arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@329['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@326['AbstractStringBuilder'] {
+    arguments = ArrayList@327[empty]
+    classifier = JavaClassImpl@328['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@330['AbstractStringBuilder'] {
-    arguments = ArrayList@331[empty]
-    classifier = JavaClassImpl@332['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@329['AbstractStringBuilder'] {
+    arguments = ArrayList@330[empty]
+    classifier = JavaClassImpl@331['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@333['AbstractStringBuilder'] {
-    arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@335['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@332['AbstractStringBuilder'] {
+    arguments = ArrayList@333[empty]
+    classifier = JavaClassImpl@334['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@336['AbstractStringBuilder'] {
-    arguments = ArrayList@337[empty]
-    classifier = JavaClassImpl@338['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@335['AbstractStringBuilder'] {
+    arguments = ArrayList@336[empty]
+    classifier = JavaClassImpl@337['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@339['AbstractStringBuilder'] {
-    arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@341['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@338['AbstractStringBuilder'] {
+    arguments = ArrayList@339[empty]
+    classifier = JavaClassImpl@340['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@342['AbstractStringBuilder'] {
-    arguments = ArrayList@343[empty]
-    classifier = JavaClassImpl@344['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@341['AbstractStringBuilder'] {
+    arguments = ArrayList@342[empty]
+    classifier = JavaClassImpl@343['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@345['AbstractStringBuilder'] {
-    arguments = ArrayList@346[empty]
-    classifier = JavaClassImpl@347['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@344['AbstractStringBuilder'] {
+    arguments = ArrayList@345[empty]
+    classifier = JavaClassImpl@346['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@348['AbstractStringBuilder'] {
-    arguments = ArrayList@349[empty]
-    classifier = JavaClassImpl@350['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@347['AbstractStringBuilder'] {
+    arguments = ArrayList@348[empty]
+    classifier = JavaClassImpl@349['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@351['AbstractStringBuilder'] {
-    arguments = ArrayList@352[empty]
-    classifier = JavaClassImpl@353['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@350['AbstractStringBuilder'] {
+    arguments = ArrayList@351[empty]
+    classifier = JavaClassImpl@352['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@354['AbstractStringBuilder'] {
-    arguments = ArrayList@355[empty]
-    classifier = JavaClassImpl@356['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@353['AbstractStringBuilder'] {
+    arguments = ArrayList@354[empty]
+    classifier = JavaClassImpl@355['AbstractStringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@357['AbstractStringBuilder'] {
-    arguments = ArrayList@358[empty]
-    classifier = JavaClassImpl@359['AbstractStringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@356['AbstractStringBuilder'] {
+    arguments = ArrayList@357[empty]
+    classifier = JavaClassImpl@349['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@360['AbstractStringBuilder'] {
-    arguments = ArrayList@361[empty]
-    classifier = JavaClassImpl@332['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@359['AbstractStringBuilder'] {
+    arguments = ArrayList@360[empty]
+    classifier = JavaClassImpl@337['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
+}
+
+LazyJavaClassifierType@361['AbstractStringBuilder'] {
+    arguments = ArrayList@362[empty]
+    classifier = JavaClassImpl@352['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@363['AbstractStringBuilder'] {
     arguments = ArrayList@364[empty]
-    classifier = JavaClassImpl@326['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@334['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@365['AbstractStringBuilder'] {
     arguments = ArrayList@366[empty]
-    classifier = JavaClassImpl@323['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@316['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@367['AbstractStringBuilder'] {
     arguments = ArrayList@368[empty]
-    classifier = JavaClassImpl@338['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@331['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@369['AbstractStringBuilder'] {
     arguments = ArrayList@370[empty]
-    classifier = JavaClassImpl@341['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@322['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@371['AbstractStringBuilder'] {
     arguments = ArrayList@372[empty]
-    classifier = JavaClassImpl@353['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@319['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@373['AbstractStringBuilder'] {
     arguments = ArrayList@374[empty]
-    classifier = JavaClassImpl@347['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@355['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@375['AbstractStringBuilder'] {
     arguments = ArrayList@376[empty]
-    classifier = JavaClassImpl@356['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@325['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@377['AbstractStringBuilder'] {
     arguments = ArrayList@378[empty]
-    classifier = JavaClassImpl@344['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@328['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@379['AbstractStringBuilder'] {
     arguments = ArrayList@380[empty]
-    classifier = JavaClassImpl@335['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@346['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@381['AbstractStringBuilder'] {
     arguments = ArrayList@382[empty]
-    classifier = JavaClassImpl@320['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@340['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
 LazyJavaClassifierType@383['AbstractStringBuilder'] {
     arguments = ArrayList@384[empty]
-    classifier = JavaClassImpl@329['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@343['AbstractStringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@385['AbstractStringBuilder'] {
-    arguments = ArrayList@386[empty]
-    classifier = JavaClassImpl@350['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@294['AbstractStringBuilder'] {
+    arguments = ArrayList@385[empty]
+    classifier = JavaClassImpl@386['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@51['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@387['AbstractStringBuilder'] {
-    arguments = ArrayList@388[empty]
-    classifier = JavaClassImpl@359['AbstractStringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+LazyJavaClassifierType@239['Appendable'] {
+    arguments = ArrayList@387[empty]
+    classifier = JavaClassImpl@388['Appendable']
+    memberScope = LazyJavaClassMemberScope@59
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassifierType@298['AbstractStringBuilder'] {
+LazyJavaClassifierType@277['Appendable'] {
     arguments = ArrayList@389[empty]
-    classifier = JavaClassImpl@390['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@59['AbstractStringBuilder']
+    classifier = JavaClassImpl@390['Appendable']
+    memberScope = LazyJavaClassMemberScope@59
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassifierType@281['Appendable'] {
-    arguments = ArrayList@391[empty]
-    classifier = JavaClassImpl@392['Appendable']
-    memberScope = LazyJavaClassMemberScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassifierType@391['Appendable'] {
+    arguments = ArrayList@392[empty]
+    classifier = JavaClassImpl@393['Appendable']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassifierType@243['Appendable'] {
-    arguments = ArrayList@393[empty]
-    classifier = JavaClassImpl@394['Appendable']
-    memberScope = LazyJavaClassMemberScope@67
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassifierType@394['Appendable'] {
+    arguments = ArrayList@395[empty]
+    classifier = JavaClassImpl@396['Appendable']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassifierType@395['Appendable'] {
-    arguments = ArrayList@396[empty]
-    classifier = JavaClassImpl@397['Appendable']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassifierType@397['Appendable'] {
+    arguments = ArrayList@398[empty]
+    classifier = JavaClassImpl@399['Appendable']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassifierType@398['Appendable'] {
-    arguments = ArrayList@399[empty]
-    classifier = JavaClassImpl@400['Appendable']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassifierType@400['Appendable'] {
+    arguments = ArrayList@401[empty]
+    classifier = JavaClassImpl@396['Appendable']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassifierType@401['Appendable'] {
-    arguments = ArrayList@402[empty]
-    classifier = JavaClassImpl@403['Appendable']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassifierType@402['Appendable'] {
+    arguments = ArrayList@403[empty]
+    classifier = JavaClassImpl@393['Appendable']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
 LazyJavaClassifierType@404['Appendable'] {
     arguments = ArrayList@405[empty]
-    classifier = JavaClassImpl@403['Appendable']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+    classifier = JavaClassImpl@399['Appendable']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@67['Appendable']
 }
 
-LazyJavaClassifierType@406['Appendable'] {
-    arguments = ArrayList@407[empty]
-    classifier = JavaClassImpl@400['Appendable']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassifierType@258['AutoCloseable'] {
+    arguments = ArrayList@406[empty]
+    classifier = JavaClassImpl@407['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@92
+    typeConstructor = LazyJavaClassTypeConstructor@95['AutoCloseable']
 }
 
-LazyJavaClassifierType@408['Appendable'] {
-    arguments = ArrayList@409[empty]
-    classifier = JavaClassImpl@397['Appendable']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@75['Appendable']
+LazyJavaClassifierType@301['CharSequence'] {
+    arguments = ArrayList@408[empty]
+    classifier = JavaClassImpl@409['CharSequence']
+    memberScope = DeserializedClassMemberScope@410
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@262['AutoCloseable'] {
-    arguments = ArrayList@410[empty]
-    classifier = JavaClassImpl@411['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@97
-    typeConstructor = LazyJavaClassTypeConstructor@101['AutoCloseable']
-}
-
-LazyJavaClassifierType@305['CharSequence'] {
+LazyJavaClassifierType@240['CharSequence'] {
     arguments = ArrayList@412[empty]
     classifier = JavaClassImpl@413['CharSequence']
-    memberScope = DeserializedClassMemberScope@414
-    typeConstructor = DeserializedClassTypeConstructor@415
+    memberScope = DeserializedClassMemberScope@410
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@244['CharSequence'] {
-    arguments = ArrayList@416[empty]
-    classifier = JavaClassImpl@417['CharSequence']
-    memberScope = DeserializedClassMemberScope@414
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@414['CharSequence'] {
+    arguments = ArrayList@415[empty]
+    classifier = JavaClassImpl@416['CharSequence']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@418['CharSequence'] {
-    arguments = ArrayList@419[empty]
-    classifier = JavaClassImpl@420['CharSequence']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@417['CharSequence'] {
+    arguments = ArrayList@418[empty]
+    classifier = JavaClassImpl@419['CharSequence']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@421['CharSequence'] {
-    arguments = ArrayList@422[empty]
-    classifier = JavaClassImpl@423['CharSequence']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@420['CharSequence'] {
+    arguments = ArrayList@421[empty]
+    classifier = JavaClassImpl@422['CharSequence']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@424['CharSequence'] {
-    arguments = ArrayList@425[empty]
-    classifier = JavaClassImpl@426['CharSequence']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@423['CharSequence'] {
+    arguments = ArrayList@424[empty]
+    classifier = JavaClassImpl@425['CharSequence']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@427['CharSequence'] {
-    arguments = ArrayList@428[empty]
-    classifier = JavaClassImpl@429['CharSequence']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@426['CharSequence'] {
+    arguments = ArrayList@427[empty]
+    classifier = JavaClassImpl@428['CharSequence']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@430['CharSequence'] {
-    arguments = ArrayList@431[empty]
-    classifier = JavaClassImpl@432['CharSequence']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@429['CharSequence'] {
+    arguments = ArrayList@430[empty]
+    classifier = JavaClassImpl@431['CharSequence']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@433['CharSequence'] {
-    arguments = ArrayList@434[empty]
-    classifier = JavaClassImpl@435['CharSequence']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@432['CharSequence'] {
+    arguments = ArrayList@433[empty]
+    classifier = JavaClassImpl@434['CharSequence']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@436['CharSequence'] {
-    arguments = ArrayList@437[empty]
-    classifier = JavaClassImpl@438['CharSequence']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@435['CharSequence'] {
+    arguments = ArrayList@436[empty]
+    classifier = JavaClassImpl@428['CharSequence']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@411
+}
+
+LazyJavaClassifierType@437['CharSequence'] {
+    arguments = ArrayList@438[empty]
+    classifier = JavaClassImpl@434['CharSequence']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@439['CharSequence'] {
     arguments = ArrayList@440[empty]
-    classifier = JavaClassImpl@435['CharSequence']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@415
+    classifier = JavaClassImpl@416['CharSequence']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@441['CharSequence'] {
     arguments = ArrayList@442[empty]
-    classifier = JavaClassImpl@429['CharSequence']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@415
+    classifier = JavaClassImpl@431['CharSequence']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@443['CharSequence'] {
     arguments = ArrayList@444[empty]
-    classifier = JavaClassImpl@426['CharSequence']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@415
+    classifier = JavaClassImpl@425['CharSequence']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@445['CharSequence'] {
     arguments = ArrayList@446[empty]
-    classifier = JavaClassImpl@420['CharSequence']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@415
+    classifier = JavaClassImpl@422['CharSequence']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
 LazyJavaClassifierType@447['CharSequence'] {
     arguments = ArrayList@448[empty]
-    classifier = JavaClassImpl@438['CharSequence']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@415
+    classifier = JavaClassImpl@419['CharSequence']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@449['CharSequence'] {
-    arguments = ArrayList@450[empty]
-    classifier = JavaClassImpl@423['CharSequence']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@296['CharSequence'] {
+    classifier = JavaClassImpl@449['CharSequence']
+    typeConstructor = DeserializedClassTypeConstructor@411
 }
 
-LazyJavaClassifierType@451['CharSequence'] {
-    arguments = ArrayList@452[empty]
-    classifier = JavaClassImpl@432['CharSequence']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@450['Charset'] {
+    arguments = ArrayList@451[empty]
+    classifier = JavaClassImpl@452['Charset']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@112['Charset']
 }
 
-LazyJavaClassifierType@300['CharSequence'] {
-    classifier = JavaClassImpl@453['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@415
+LazyJavaClassifierType@453['Charset'] {
+    arguments = ArrayList@454[empty]
+    classifier = JavaClassImpl@452['Charset']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@112['Charset']
 }
 
-LazyJavaClassifierType@454['Charset'] {
-    arguments = ArrayList@455[empty]
-    classifier = JavaClassImpl@456['Charset']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@117['Charset']
-}
-
-LazyJavaClassifierType@457['Charset'] {
-    arguments = ArrayList@458[empty]
-    classifier = JavaClassImpl@456['Charset']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@117['Charset']
-}
-
-LazyJavaClassifierType@459['CharsetDecoder'] {
+LazyJavaClassifierType@455['CharsetDecoder'] {
     classifier = null
-    nullable = 'false': Boolean@311
-    typeConstructor = TypeConstructorImpl$1@460
+    nullable = 'false': Boolean@307
+    typeConstructor = TypeConstructorImpl$1@456
 }
 
-LazyJavaClassifierType@461['CharsetDecoder'] {
-    nullable = 'true': Boolean@362
+LazyJavaClassifierType@457['CharsetDecoder'] {
+    nullable = 'true': Boolean@358
 }
 
-LazyJavaClassifierType@462['Cloneable'] {
+LazyJavaClassifierType@458['Cloneable'] {
+    arguments = ArrayList@459[empty]
+    classifier = JavaClassImpl@460['Cloneable']
+    memberScope = DeserializedClassMemberScope@461
+    typeConstructor = DeserializedClassTypeConstructor@462
+}
+
+LazyJavaClassifierType@278['Closeable'] {
     arguments = ArrayList@463[empty]
-    classifier = JavaClassImpl@464['Cloneable']
-    memberScope = DeserializedClassMemberScope@465
-    typeConstructor = DeserializedClassTypeConstructor@466
+    classifier = JavaClassImpl@464['Closeable']
+    memberScope = LazyJavaClassMemberScope@114
+    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
 }
 
-LazyJavaClassifierType@277['Closeable'] {
+LazyJavaClassifierType@289['Closeable'] {
+    arguments = ArrayList@465[empty]
+    classifier = JavaClassImpl@466['Closeable']
+    memberScope = LazyJavaClassMemberScope@114
+    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
+}
+
+LazyJavaClassifierType@273['Closeable'] {
     arguments = ArrayList@467[empty]
     classifier = JavaClassImpl@468['Closeable']
-    memberScope = LazyJavaClassMemberScope@119
-    typeConstructor = LazyJavaClassTypeConstructor@121['Closeable']
+    memberScope = LazyJavaClassMemberScope@114
+    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
 }
 
-LazyJavaClassifierType@293['Closeable'] {
+LazyJavaClassifierType@267['Closeable'] {
     arguments = ArrayList@469[empty]
     classifier = JavaClassImpl@470['Closeable']
-    memberScope = LazyJavaClassMemberScope@119
-    typeConstructor = LazyJavaClassTypeConstructor@121['Closeable']
+    typeConstructor = LazyJavaClassTypeConstructor@116['Closeable']
 }
 
-LazyJavaClassifierType@282['Closeable'] {
-    arguments = ArrayList@471[empty]
-    classifier = JavaClassImpl@472['Closeable']
-    memberScope = LazyJavaClassMemberScope@119
-    typeConstructor = LazyJavaClassTypeConstructor@121['Closeable']
+LazyJavaClassifierType@471['Collection<? extends E>'] {
+    arguments = ArrayList@472[1] { TypeProjectionImpl@473 }
+    classifier = JavaClassImpl@474['Collection']
+    memberScope = SubstitutingScope@475
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@476
 }
 
-LazyJavaClassifierType@271['Closeable'] {
-    arguments = ArrayList@473[empty]
-    classifier = JavaClassImpl@474['Closeable']
-    typeConstructor = LazyJavaClassTypeConstructor@121['Closeable']
+LazyJavaClassifierType@477['Collection<? extends E>'] {
+    arguments = ArrayList@478[1] { TypeProjectionImpl@479 }
+    classifier = JavaClassImpl@474['Collection']
+    memberScope = SubstitutingScope@480
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@481
 }
 
-LazyJavaClassifierType@475['Collection<? extends E>'] {
-    arguments = ArrayList@476[1] { TypeProjectionImpl@477 }
-    classifier = JavaClassImpl@478['Collection']
-    memberScope = SubstitutingScope@479
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@480
-}
-
-LazyJavaClassifierType@481['Collection<? extends E>'] {
+LazyJavaClassifierType@231['Collection<E>'] {
     arguments = ArrayList@482[1] { TypeProjectionImpl@483 }
-    classifier = JavaClassImpl@478['Collection']
-    memberScope = SubstitutingScope@484
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@485
+    classifier = JavaClassImpl@484['Collection']
+    memberScope = SubstitutingScope@485
+    typeConstructor = DeserializedClassTypeConstructor@476
 }
 
-LazyJavaClassifierType@235['Collection<E>'] {
-    arguments = ArrayList@486[1] { TypeProjectionImpl@487 }
-    classifier = JavaClassImpl@488['Collection']
-    memberScope = SubstitutingScope@489
-    typeConstructor = DeserializedClassTypeConstructor@480
+LazyJavaClassifierType@486['E'] {
+    arguments = ArrayList@487[empty]
+    classifier = JavaTypeParameterImpl@488['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@490['E'] {
     arguments = ArrayList@491[empty]
     classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
-LazyJavaClassifierType@494['E'] {
-    arguments = ArrayList@495[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+LazyJavaClassifierType@493['E'] {
+    arguments = ArrayList@494[empty]
+    classifier = JavaTypeParameterImpl@495['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
-LazyJavaClassifierType@498['E'] {
-    arguments = ArrayList@499[empty]
-    classifier = JavaTypeParameterImpl@500['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+LazyJavaClassifierType@497['E'] {
+    arguments = ArrayList@498[empty]
+    classifier = JavaTypeParameterImpl@499['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
-LazyJavaClassifierType@501['E'] {
-    arguments = ArrayList@502[empty]
-    classifier = JavaTypeParameterImpl@503['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+LazyJavaClassifierType@500['E'] {
+    arguments = ArrayList@501[empty]
+    classifier = JavaTypeParameterImpl@502['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
-LazyJavaClassifierType@504['E'] {
-    arguments = ArrayList@505[empty]
-    classifier = JavaTypeParameterImpl@506['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+LazyJavaClassifierType@503['E'] {
+    arguments = ArrayList@504[empty]
+    classifier = JavaTypeParameterImpl@505['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
 }
 
 LazyJavaClassifierType@507['E'] {
     arguments = ArrayList@508[empty]
     classifier = JavaTypeParameterImpl@509['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
 }
 
 LazyJavaClassifierType@510['E'] {
     arguments = ArrayList@511[empty]
     classifier = JavaTypeParameterImpl@512['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@513
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
-LazyJavaClassifierType@514['E'] {
-    arguments = ArrayList@515[empty]
-    classifier = JavaTypeParameterImpl@516['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+LazyJavaClassifierType@513['E'] {
+    arguments = ArrayList@514[empty]
+    classifier = JavaTypeParameterImpl@515['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
-LazyJavaClassifierType@517['E'] {
-    arguments = ArrayList@518[empty]
-    classifier = JavaTypeParameterImpl@519['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+LazyJavaClassifierType@516['E'] {
+    arguments = ArrayList@517[empty]
+    classifier = JavaTypeParameterImpl@518['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
-LazyJavaClassifierType@520['E'] {
-    arguments = ArrayList@521[empty]
-    classifier = JavaTypeParameterImpl@522['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+LazyJavaClassifierType@519['E'] {
+    arguments = ArrayList@520[empty]
+    classifier = JavaTypeParameterImpl@521['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
-LazyJavaClassifierType@523['E'] {
-    arguments = ArrayList@524[empty]
-    classifier = JavaTypeParameterImpl@525['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+LazyJavaClassifierType@522['E'] {
+    arguments = ArrayList@523[empty]
+    classifier = JavaTypeParameterImpl@524['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
-LazyJavaClassifierType@526['E'] {
-    arguments = ArrayList@527[empty]
-    classifier = JavaTypeParameterImpl@528['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+LazyJavaClassifierType@525['E'] {
+    arguments = ArrayList@526[empty]
+    classifier = JavaTypeParameterImpl@527['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
-LazyJavaClassifierType@529['E'] {
-    arguments = ArrayList@530[empty]
-    classifier = JavaTypeParameterImpl@531['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+LazyJavaClassifierType@528['E'] {
+    arguments = ArrayList@529[empty]
+    classifier = JavaTypeParameterImpl@530['E']
+    nullable = 'false': Boolean@307
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
-LazyJavaClassifierType@532['E'] {
-    arguments = ArrayList@533[empty]
-    classifier = JavaTypeParameterImpl@534['E']
-    nullable = 'false': Boolean@311
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@513
+LazyJavaClassifierType@531['E'] {
+    arguments = ArrayList@532[empty]
+    classifier = JavaTypeParameterImpl@515['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+}
+
+LazyJavaClassifierType@533['E'] {
+    arguments = ArrayList@534[empty]
+    classifier = JavaTypeParameterImpl@509['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
 }
 
 LazyJavaClassifierType@535['E'] {
     arguments = ArrayList@536[empty]
-    classifier = JavaTypeParameterImpl@496['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    classifier = JavaTypeParameterImpl@512['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@537['E'] {
     arguments = ArrayList@538[empty]
-    classifier = JavaTypeParameterImpl@503['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    classifier = JavaTypeParameterImpl@505['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
 }
 
 LazyJavaClassifierType@539['E'] {
     arguments = ArrayList@540[empty]
-    classifier = JavaTypeParameterImpl@492['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+    classifier = JavaTypeParameterImpl@488['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@541['E'] {
     arguments = ArrayList@542[empty]
-    classifier = JavaTypeParameterImpl@509['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    classifier = JavaTypeParameterImpl@527['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@543['E'] {
     arguments = ArrayList@544[empty]
-    classifier = JavaTypeParameterImpl@519['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    classifier = JavaTypeParameterImpl@518['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@545['E'] {
     arguments = ArrayList@546[empty]
-    classifier = JavaTypeParameterImpl@525['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+    classifier = JavaTypeParameterImpl@495['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@547['E'] {
     arguments = ArrayList@548[empty]
-    classifier = JavaTypeParameterImpl@500['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+    classifier = JavaTypeParameterImpl@530['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@549['E'] {
     arguments = ArrayList@550[empty]
-    classifier = JavaTypeParameterImpl@528['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    classifier = JavaTypeParameterImpl@492['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@551['E'] {
     arguments = ArrayList@552[empty]
-    classifier = JavaTypeParameterImpl@522['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    classifier = JavaTypeParameterImpl@521['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@553['E'] {
     arguments = ArrayList@554[empty]
-    classifier = JavaTypeParameterImpl@516['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
+    classifier = JavaTypeParameterImpl@499['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
 }
 
 LazyJavaClassifierType@555['E'] {
     arguments = ArrayList@556[empty]
-    classifier = JavaTypeParameterImpl@531['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
+    classifier = JavaTypeParameterImpl@524['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@557['E'] {
     arguments = ArrayList@558[empty]
-    classifier = JavaTypeParameterImpl@534['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@513
+    classifier = JavaTypeParameterImpl@502['E']
+    nullable = 'true': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
-LazyJavaClassifierType@559['E'] {
-    arguments = ArrayList@560[empty]
-    classifier = JavaTypeParameterImpl@512['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@513
+LazyJavaClassifierType@276['FilterOutputStream'] {
+    arguments = ArrayList@559[empty]
+    classifier = JavaClassImpl@560['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@126
+    typeConstructor = LazyJavaClassTypeConstructor@128['FilterOutputStream']
 }
 
-LazyJavaClassifierType@561['E'] {
-    arguments = ArrayList@562[empty]
-    classifier = JavaTypeParameterImpl@506['E']
-    nullable = 'true': Boolean@362
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-}
-
-LazyJavaClassifierType@280['FilterOutputStream'] {
-    arguments = ArrayList@563[empty]
-    classifier = JavaClassImpl@564['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@131
-    typeConstructor = LazyJavaClassTypeConstructor@133['FilterOutputStream']
-}
-
-LazyJavaClassifierType@565['Flushable'] {
+LazyJavaClassifierType@561['Flushable'] {
     classifier = null
-    typeConstructor = TypeConstructorImpl$1@566
+    typeConstructor = TypeConstructorImpl$1@562
 }
 
-LazyJavaClassifierType@567['InputStream'] {
-    arguments = ArrayList@568[empty]
-    classifier = JavaClassImpl@569['InputStream']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+LazyJavaClassifierType@563['InputStream'] {
+    arguments = ArrayList@564[empty]
+    classifier = JavaClassImpl@565['InputStream']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
-LazyJavaClassifierType@570['InputStream'] {
-    arguments = ArrayList@571[empty]
-    classifier = JavaClassImpl@572['InputStream']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+LazyJavaClassifierType@566['InputStream'] {
+    arguments = ArrayList@567[empty]
+    classifier = JavaClassImpl@568['InputStream']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
-LazyJavaClassifierType@573['InputStream'] {
-    arguments = ArrayList@574[empty]
-    classifier = JavaClassImpl@575['InputStream']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+LazyJavaClassifierType@569['InputStream'] {
+    arguments = ArrayList@570[empty]
+    classifier = JavaClassImpl@571['InputStream']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
-LazyJavaClassifierType@576['InputStream'] {
-    arguments = ArrayList@577[empty]
-    classifier = JavaClassImpl@578['InputStream']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+LazyJavaClassifierType@572['InputStream'] {
+    arguments = ArrayList@573[empty]
+    classifier = JavaClassImpl@574['InputStream']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
-LazyJavaClassifierType@579['InputStream'] {
-    arguments = ArrayList@580[empty]
-    classifier = JavaClassImpl@581['InputStream']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+LazyJavaClassifierType@575['InputStream'] {
+    arguments = ArrayList@576[empty]
+    classifier = JavaClassImpl@577['InputStream']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
+}
+
+LazyJavaClassifierType@578['InputStream'] {
+    arguments = ArrayList@579[empty]
+    classifier = JavaClassImpl@568['InputStream']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
+}
+
+LazyJavaClassifierType@580['InputStream'] {
+    arguments = ArrayList@581[empty]
+    classifier = JavaClassImpl@577['InputStream']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
 LazyJavaClassifierType@582['InputStream'] {
     arguments = ArrayList@583[empty]
-    classifier = JavaClassImpl@581['InputStream']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+    classifier = JavaClassImpl@565['InputStream']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
 LazyJavaClassifierType@584['InputStream'] {
     arguments = ArrayList@585[empty]
-    classifier = JavaClassImpl@572['InputStream']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+    classifier = JavaClassImpl@574['InputStream']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
 LazyJavaClassifierType@586['InputStream'] {
     arguments = ArrayList@587[empty]
-    classifier = JavaClassImpl@578['InputStream']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+    classifier = JavaClassImpl@571['InputStream']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@130['InputStream']
 }
 
-LazyJavaClassifierType@588['InputStream'] {
-    arguments = ArrayList@589[empty]
-    classifier = JavaClassImpl@569['InputStream']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+LazyJavaClassifierType@236['List<E>'] {
+    arguments = ArrayList@588[1] { TypeProjectionImpl@589 }
+    classifier = JavaClassImpl@590['List']
+    memberScope = SubstitutingScope@591
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@592
 }
 
-LazyJavaClassifierType@590['InputStream'] {
-    arguments = ArrayList@591[empty]
-    classifier = JavaClassImpl@575['InputStream']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@135['InputStream']
+LazyJavaClassifierType@248['List<E>'] {
+    arguments = ArrayList@593[1] { TypeProjectionImpl@594 }
+    classifier = JavaClassImpl@595['List']
+    memberScope = SubstitutingScope@596
+    typeConstructor = DeserializedClassTypeConstructor@592
 }
 
-LazyJavaClassifierType@240['List<E>'] {
-    arguments = ArrayList@592[1] { TypeProjectionImpl@593 }
-    classifier = JavaClassImpl@594['List']
-    memberScope = SubstitutingScope@595
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@596
+LazyJavaClassifierType@597['Object'] {
+    arguments = ArrayList@598[empty]
+    classifier = JavaClassImpl@599['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@252['List<E>'] {
-    arguments = ArrayList@597[1] { TypeProjectionImpl@598 }
-    classifier = JavaClassImpl@599['List']
-    memberScope = SubstitutingScope@600
-    typeConstructor = DeserializedClassTypeConstructor@596
+LazyJavaClassifierType@602['Object'] {
+    arguments = ArrayList@603[empty]
+    classifier = JavaClassImpl@604['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@601['Object'] {
-    arguments = ArrayList@602[empty]
-    classifier = JavaClassImpl@603['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@605['Object'] {
+    arguments = ArrayList@606[empty]
+    classifier = JavaClassImpl@607['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@606['Object'] {
-    arguments = ArrayList@607[empty]
-    classifier = JavaClassImpl@608['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@608['Object'] {
+    arguments = ArrayList@609[empty]
+    classifier = JavaClassImpl@610['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@609['Object'] {
-    arguments = ArrayList@610[empty]
-    classifier = JavaClassImpl@611['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@611['Object'] {
+    arguments = ArrayList@612[empty]
+    classifier = JavaClassImpl@599['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@612['Object'] {
-    arguments = ArrayList@613[empty]
-    classifier = JavaClassImpl@614['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@613['Object'] {
+    arguments = ArrayList@614[empty]
+    classifier = JavaClassImpl@610['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@615['Object'] {
     arguments = ArrayList@616[empty]
-    classifier = JavaClassImpl@614['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@605
+    classifier = JavaClassImpl@604['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@617['Object'] {
     arguments = ArrayList@618[empty]
-    classifier = JavaClassImpl@608['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@605
+    classifier = JavaClassImpl@607['Object']
+    memberScope = DeserializedClassMemberScope@600
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@619['Object'] {
     arguments = ArrayList@620[empty]
-    classifier = JavaClassImpl@611['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@605
+    classifier = JavaClassImpl@621['Object']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@621['Object'] {
-    arguments = ArrayList@622[empty]
-    classifier = JavaClassImpl@603['Object']
-    memberScope = DeserializedClassMemberScope@604
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@622['Object'] {
+    arguments = ArrayList@623[empty]
+    classifier = JavaClassImpl@624['Object']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@623['Object'] {
-    arguments = ArrayList@624[empty]
-    classifier = JavaClassImpl@625['Object']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@625['Object'] {
+    arguments = ArrayList@626[empty]
+    classifier = JavaClassImpl@627['Object']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@626['Object'] {
-    arguments = ArrayList@627[empty]
-    classifier = JavaClassImpl@628['Object']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@628['Object'] {
+    arguments = ArrayList@629[empty]
+    classifier = JavaClassImpl@627['Object']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@629['Object'] {
-    arguments = ArrayList@630[empty]
-    classifier = JavaClassImpl@631['Object']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@630['Object'] {
+    arguments = ArrayList@631[empty]
+    classifier = JavaClassImpl@621['Object']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@632['Object'] {
     arguments = ArrayList@633[empty]
-    classifier = JavaClassImpl@625['Object']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@605
+    classifier = JavaClassImpl@624['Object']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@634['Object'] {
-    arguments = ArrayList@635[empty]
-    classifier = JavaClassImpl@631['Object']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@605
+    classifier = JavaClassImpl@635['Object']
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@636['Object'] {
-    arguments = ArrayList@637[empty]
-    classifier = JavaClassImpl@628['Object']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@605
+    classifier = JavaClassImpl@637['Object']
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@638['Object'] {
     classifier = JavaClassImpl@639['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@640['Object'] {
     classifier = JavaClassImpl@641['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@642['Object'] {
     classifier = JavaClassImpl@643['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@644['Object'] {
     classifier = JavaClassImpl@645['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@646['Object'] {
     classifier = JavaClassImpl@647['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@648['Object'] {
     classifier = JavaClassImpl@649['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@650['Object'] {
     classifier = JavaClassImpl@651['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@652['Object'] {
     classifier = JavaClassImpl@653['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@654['Object'] {
     classifier = JavaClassImpl@655['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
 LazyJavaClassifierType@656['Object'] {
     classifier = JavaClassImpl@657['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+    typeConstructor = DeserializedClassTypeConstructor@601
 }
 
-LazyJavaClassifierType@658['Object'] {
-    classifier = JavaClassImpl@659['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@264['OutputStream'] {
+    arguments = ArrayList@658[empty]
+    classifier = JavaClassImpl@659['OutputStream']
+    memberScope = LazyJavaClassMemberScope@140
+    typeConstructor = LazyJavaClassTypeConstructor@142['OutputStream']
 }
 
-LazyJavaClassifierType@660['Object'] {
-    classifier = JavaClassImpl@661['Object']
-    typeConstructor = DeserializedClassTypeConstructor@605
+LazyJavaClassifierType@660['PrintStream'] {
+    arguments = ArrayList@661[empty]
+    classifier = JavaClassImpl@662['PrintStream']
+    memberScope = LazyJavaClassMemberScope@146
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@155['PrintStream']
 }
 
-LazyJavaClassifierType@268['OutputStream'] {
-    arguments = ArrayList@662[empty]
-    classifier = JavaClassImpl@663['OutputStream']
-    memberScope = LazyJavaClassMemberScope@145
-    typeConstructor = LazyJavaClassTypeConstructor@147['OutputStream']
+LazyJavaClassifierType@663['PrintStream'] {
+    arguments = ArrayList@664[empty]
+    classifier = JavaClassImpl@662['PrintStream']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@155['PrintStream']
 }
 
-LazyJavaClassifierType@664['PrintStream'] {
+LazyJavaClassifierType@249['RandomAccess'] {
     arguments = ArrayList@665[empty]
-    classifier = JavaClassImpl@666['PrintStream']
-    memberScope = LazyJavaClassMemberScope@151
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@159['PrintStream']
+    classifier = JavaClassImpl@666['RandomAccess']
+    memberScope = LazyJavaClassMemberScope@172
+    typeConstructor = LazyJavaClassTypeConstructor@174['RandomAccess']
 }
 
-LazyJavaClassifierType@667['PrintStream'] {
-    arguments = ArrayList@668[empty]
-    classifier = JavaClassImpl@666['PrintStream']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@159['PrintStream']
-}
-
-LazyJavaClassifierType@253['RandomAccess'] {
-    arguments = ArrayList@669[empty]
-    classifier = JavaClassImpl@670['RandomAccess']
+LazyJavaClassifierType@288['Readable'] {
+    arguments = ArrayList@667[empty]
+    classifier = JavaClassImpl@668['Readable']
     memberScope = LazyJavaClassMemberScope@176
-    typeConstructor = LazyJavaClassTypeConstructor@178['RandomAccess']
+    typeConstructor = LazyJavaClassTypeConstructor@178['Readable']
 }
 
-LazyJavaClassifierType@292['Readable'] {
-    arguments = ArrayList@671[empty]
-    classifier = JavaClassImpl@672['Readable']
+LazyJavaClassifierType@254['Reader'] {
+    arguments = ArrayList@669[empty]
+    classifier = JavaClassImpl@670['Reader']
     memberScope = LazyJavaClassMemberScope@180
-    typeConstructor = LazyJavaClassTypeConstructor@182['Readable']
+    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
-LazyJavaClassifierType@258['Reader'] {
-    arguments = ArrayList@673[empty]
-    classifier = JavaClassImpl@674['Reader']
-    memberScope = LazyJavaClassMemberScope@184
-    typeConstructor = LazyJavaClassTypeConstructor@186['Reader']
+LazyJavaClassifierType@671['Reader'] {
+    arguments = ArrayList@672[empty]
+    classifier = JavaClassImpl@673['Reader']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
-LazyJavaClassifierType@675['Reader'] {
-    arguments = ArrayList@676[empty]
-    classifier = JavaClassImpl@677['Reader']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@186['Reader']
+LazyJavaClassifierType@674['Reader'] {
+    arguments = ArrayList@675[empty]
+    classifier = JavaClassImpl@676['Reader']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
-LazyJavaClassifierType@678['Reader'] {
-    arguments = ArrayList@679[empty]
-    classifier = JavaClassImpl@680['Reader']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@186['Reader']
+LazyJavaClassifierType@677['Reader'] {
+    arguments = ArrayList@678[empty]
+    classifier = JavaClassImpl@676['Reader']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
-LazyJavaClassifierType@681['Reader'] {
-    arguments = ArrayList@682[empty]
-    classifier = JavaClassImpl@680['Reader']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@186['Reader']
+LazyJavaClassifierType@679['Reader'] {
+    arguments = ArrayList@680[empty]
+    classifier = JavaClassImpl@673['Reader']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
 }
 
-LazyJavaClassifierType@683['Reader'] {
+LazyJavaClassifierType@270['Reader'] {
+    arguments = ArrayList@681[empty]
+    classifier = JavaClassImpl@682['Reader']
+    typeConstructor = LazyJavaClassTypeConstructor@182['Reader']
+}
+
+LazyJavaClassifierType@683['Serializable'] {
     arguments = ArrayList@684[empty]
-    classifier = JavaClassImpl@677['Reader']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@186['Reader']
+    classifier = JavaClassImpl@685['Serializable']
+    memberScope = LazyJavaClassMemberScope@184
+    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
 }
 
-LazyJavaClassifierType@274['Reader'] {
-    arguments = ArrayList@685[empty]
-    classifier = JavaClassImpl@686['Reader']
-    typeConstructor = LazyJavaClassTypeConstructor@186['Reader']
+LazyJavaClassifierType@281['Serializable'] {
+    arguments = ArrayList@686[empty]
+    classifier = JavaClassImpl@687['Serializable']
+    memberScope = LazyJavaClassMemberScope@184
+    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
 }
 
-LazyJavaClassifierType@285['Serializable'] {
-    arguments = ArrayList@687[empty]
-    classifier = JavaClassImpl@688['Serializable']
-    memberScope = LazyJavaClassMemberScope@188
-    typeConstructor = LazyJavaClassTypeConstructor@191['Serializable']
+LazyJavaClassifierType@300['Serializable'] {
+    arguments = ArrayList@688[empty]
+    classifier = JavaClassImpl@689['Serializable']
+    memberScope = LazyJavaClassMemberScope@184
+    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
 }
 
-LazyJavaClassifierType@304['Serializable'] {
-    arguments = ArrayList@689[empty]
+LazyJavaClassifierType@295['Serializable'] {
     classifier = JavaClassImpl@690['Serializable']
-    memberScope = LazyJavaClassMemberScope@188
-    typeConstructor = LazyJavaClassTypeConstructor@191['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@187['Serializable']
 }
 
-LazyJavaClassifierType@691['Serializable'] {
+LazyJavaClassifierType@691['String'] {
     arguments = ArrayList@692[empty]
-    classifier = JavaClassImpl@693['Serializable']
-    memberScope = LazyJavaClassMemberScope@188
-    typeConstructor = LazyJavaClassTypeConstructor@191['Serializable']
-}
-
-LazyJavaClassifierType@299['Serializable'] {
-    classifier = JavaClassImpl@694['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@191['Serializable']
+    classifier = JavaClassImpl@693['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@695['String'] {
     arguments = ArrayList@696[empty]
     classifier = JavaClassImpl@697['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@699['String'] {
-    arguments = ArrayList@700[empty]
-    classifier = JavaClassImpl@701['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@698['String'] {
+    arguments = ArrayList@699[empty]
+    classifier = JavaClassImpl@700['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@702['String'] {
-    arguments = ArrayList@703[empty]
-    classifier = JavaClassImpl@704['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@701['String'] {
+    arguments = ArrayList@702[empty]
+    classifier = JavaClassImpl@703['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@705['String'] {
-    arguments = ArrayList@706[empty]
-    classifier = JavaClassImpl@707['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@704['String'] {
+    arguments = ArrayList@705[empty]
+    classifier = JavaClassImpl@706['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@708['String'] {
-    arguments = ArrayList@709[empty]
-    classifier = JavaClassImpl@710['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@707['String'] {
+    arguments = ArrayList@708[empty]
+    classifier = JavaClassImpl@709['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@711['String'] {
-    arguments = ArrayList@712[empty]
-    classifier = JavaClassImpl@713['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@710['String'] {
+    arguments = ArrayList@711[empty]
+    classifier = JavaClassImpl@712['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@714['String'] {
-    arguments = ArrayList@715[empty]
-    classifier = JavaClassImpl@716['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@713['String'] {
+    arguments = ArrayList@714[empty]
+    classifier = JavaClassImpl@715['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@717['String'] {
-    arguments = ArrayList@718[empty]
-    classifier = JavaClassImpl@719['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@716['String'] {
+    arguments = ArrayList@717[empty]
+    classifier = JavaClassImpl@718['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@720['String'] {
-    arguments = ArrayList@721[empty]
-    classifier = JavaClassImpl@722['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@719['String'] {
+    arguments = ArrayList@720[empty]
+    classifier = JavaClassImpl@721['String']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@723['String'] {
-    arguments = ArrayList@724[empty]
-    classifier = JavaClassImpl@725['String']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@722['String'] {
+    arguments = ArrayList@723[empty]
+    classifier = JavaClassImpl@715['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
+}
+
+LazyJavaClassifierType@724['String'] {
+    arguments = ArrayList@725[empty]
+    classifier = JavaClassImpl@703['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@726['String'] {
     arguments = ArrayList@727[empty]
-    classifier = JavaClassImpl@707['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@697['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@728['String'] {
     arguments = ArrayList@729[empty]
-    classifier = JavaClassImpl@725['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@706['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@730['String'] {
     arguments = ArrayList@731[empty]
-    classifier = JavaClassImpl@710['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@712['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@732['String'] {
     arguments = ArrayList@733[empty]
-    classifier = JavaClassImpl@713['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@718['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@734['String'] {
     arguments = ArrayList@735[empty]
-    classifier = JavaClassImpl@701['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@709['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@736['String'] {
     arguments = ArrayList@737[empty]
-    classifier = JavaClassImpl@704['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@693['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@738['String'] {
     arguments = ArrayList@739[empty]
-    classifier = JavaClassImpl@697['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@700['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
 LazyJavaClassifierType@740['String'] {
     arguments = ArrayList@741[empty]
-    classifier = JavaClassImpl@719['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@721['String']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@694
 }
 
-LazyJavaClassifierType@742['String'] {
+LazyJavaClassifierType@742['StringBuffer'] {
     arguments = ArrayList@743[empty]
-    classifier = JavaClassImpl@716['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+    classifier = JavaClassImpl@744['StringBuffer']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
 }
 
-LazyJavaClassifierType@744['String'] {
-    arguments = ArrayList@745[empty]
-    classifier = JavaClassImpl@722['String']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@698
+LazyJavaClassifierType@745['StringBuffer'] {
+    arguments = ArrayList@746[empty]
+    classifier = JavaClassImpl@747['StringBuffer']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
 }
 
-LazyJavaClassifierType@746['StringBuffer'] {
-    arguments = ArrayList@747[empty]
-    classifier = JavaClassImpl@748['StringBuffer']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuffer']
+LazyJavaClassifierType@748['StringBuffer'] {
+    arguments = ArrayList@749[empty]
+    classifier = JavaClassImpl@747['StringBuffer']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
 }
 
-LazyJavaClassifierType@749['StringBuffer'] {
-    arguments = ArrayList@750[empty]
-    classifier = JavaClassImpl@751['StringBuffer']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuffer']
+LazyJavaClassifierType@750['StringBuffer'] {
+    arguments = ArrayList@751[empty]
+    classifier = JavaClassImpl@744['StringBuffer']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@189['StringBuffer']
 }
 
-LazyJavaClassifierType@752['StringBuffer'] {
+LazyJavaClassifierType@752['StringBuilder'] {
     arguments = ArrayList@753[empty]
-    classifier = JavaClassImpl@751['StringBuffer']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuffer']
+    classifier = JavaClassImpl@754['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@754['StringBuffer'] {
-    arguments = ArrayList@755[empty]
-    classifier = JavaClassImpl@748['StringBuffer']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@193['StringBuffer']
+LazyJavaClassifierType@755['StringBuilder'] {
+    arguments = ArrayList@756[empty]
+    classifier = JavaClassImpl@757['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@756['StringBuilder'] {
-    arguments = ArrayList@757[empty]
-    classifier = JavaClassImpl@758['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@758['StringBuilder'] {
+    arguments = ArrayList@759[empty]
+    classifier = JavaClassImpl@760['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@759['StringBuilder'] {
-    arguments = ArrayList@760[empty]
-    classifier = JavaClassImpl@761['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@761['StringBuilder'] {
+    arguments = ArrayList@762[empty]
+    classifier = JavaClassImpl@763['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@762['StringBuilder'] {
-    arguments = ArrayList@763[empty]
-    classifier = JavaClassImpl@764['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@764['StringBuilder'] {
+    arguments = ArrayList@765[empty]
+    classifier = JavaClassImpl@766['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@765['StringBuilder'] {
-    arguments = ArrayList@766[empty]
-    classifier = JavaClassImpl@767['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@767['StringBuilder'] {
+    arguments = ArrayList@768[empty]
+    classifier = JavaClassImpl@769['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@768['StringBuilder'] {
-    arguments = ArrayList@769[empty]
-    classifier = JavaClassImpl@770['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@770['StringBuilder'] {
+    arguments = ArrayList@771[empty]
+    classifier = JavaClassImpl@772['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@771['StringBuilder'] {
-    arguments = ArrayList@772[empty]
-    classifier = JavaClassImpl@773['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@773['StringBuilder'] {
+    arguments = ArrayList@774[empty]
+    classifier = JavaClassImpl@775['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@774['StringBuilder'] {
-    arguments = ArrayList@775[empty]
-    classifier = JavaClassImpl@776['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@776['StringBuilder'] {
+    arguments = ArrayList@777[empty]
+    classifier = JavaClassImpl@778['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@777['StringBuilder'] {
-    arguments = ArrayList@778[empty]
-    classifier = JavaClassImpl@779['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@779['StringBuilder'] {
+    arguments = ArrayList@780[empty]
+    classifier = JavaClassImpl@781['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@780['StringBuilder'] {
-    arguments = ArrayList@781[empty]
-    classifier = JavaClassImpl@782['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@782['StringBuilder'] {
+    arguments = ArrayList@783[empty]
+    classifier = JavaClassImpl@784['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@783['StringBuilder'] {
-    arguments = ArrayList@784[empty]
-    classifier = JavaClassImpl@785['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@785['StringBuilder'] {
+    arguments = ArrayList@786[empty]
+    classifier = JavaClassImpl@787['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@786['StringBuilder'] {
-    arguments = ArrayList@787[empty]
-    classifier = JavaClassImpl@788['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@788['StringBuilder'] {
+    arguments = ArrayList@789[empty]
+    classifier = JavaClassImpl@790['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@789['StringBuilder'] {
-    arguments = ArrayList@790[empty]
-    classifier = JavaClassImpl@791['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@791['StringBuilder'] {
+    arguments = ArrayList@792[empty]
+    classifier = JavaClassImpl@793['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@792['StringBuilder'] {
-    arguments = ArrayList@793[empty]
-    classifier = JavaClassImpl@794['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@794['StringBuilder'] {
+    arguments = ArrayList@795[empty]
+    classifier = JavaClassImpl@796['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@795['StringBuilder'] {
-    arguments = ArrayList@796[empty]
-    classifier = JavaClassImpl@797['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@797['StringBuilder'] {
+    arguments = ArrayList@798[empty]
+    classifier = JavaClassImpl@799['StringBuilder']
+    nullable = 'false': Boolean@307
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@798['StringBuilder'] {
-    arguments = ArrayList@799[empty]
-    classifier = JavaClassImpl@800['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@800['StringBuilder'] {
+    arguments = ArrayList@801[empty]
+    classifier = JavaClassImpl@775['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@801['StringBuilder'] {
-    arguments = ArrayList@802[empty]
-    classifier = JavaClassImpl@803['StringBuilder']
-    nullable = 'false': Boolean@311
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+LazyJavaClassifierType@802['StringBuilder'] {
+    arguments = ArrayList@803[empty]
+    classifier = JavaClassImpl@796['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@804['StringBuilder'] {
     arguments = ArrayList@805[empty]
-    classifier = JavaClassImpl@794['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@799['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@806['StringBuilder'] {
     arguments = ArrayList@807[empty]
-    classifier = JavaClassImpl@773['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@763['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@808['StringBuilder'] {
     arguments = ArrayList@809[empty]
-    classifier = JavaClassImpl@788['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@772['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@810['StringBuilder'] {
     arguments = ArrayList@811[empty]
-    classifier = JavaClassImpl@776['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@793['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@812['StringBuilder'] {
     arguments = ArrayList@813[empty]
-    classifier = JavaClassImpl@758['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@760['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@814['StringBuilder'] {
     arguments = ArrayList@815[empty]
-    classifier = JavaClassImpl@803['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@754['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@816['StringBuilder'] {
     arguments = ArrayList@817[empty]
-    classifier = JavaClassImpl@764['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@778['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@818['StringBuilder'] {
     arguments = ArrayList@819[empty]
-    classifier = JavaClassImpl@791['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@784['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@820['StringBuilder'] {
     arguments = ArrayList@821[empty]
-    classifier = JavaClassImpl@779['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@766['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@822['StringBuilder'] {
     arguments = ArrayList@823[empty]
-    classifier = JavaClassImpl@785['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@769['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@824['StringBuilder'] {
     arguments = ArrayList@825[empty]
-    classifier = JavaClassImpl@782['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@787['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@826['StringBuilder'] {
     arguments = ArrayList@827[empty]
-    classifier = JavaClassImpl@800['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@781['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@828['StringBuilder'] {
     arguments = ArrayList@829[empty]
-    classifier = JavaClassImpl@770['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@757['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
 LazyJavaClassifierType@830['StringBuilder'] {
     arguments = ArrayList@831[empty]
-    classifier = JavaClassImpl@767['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@790['StringBuilder']
+    nullable = 'true': Boolean@358
+    typeConstructor = LazyJavaClassTypeConstructor@213['StringBuilder']
 }
 
-LazyJavaClassifierType@832['StringBuilder'] {
+LazyJavaClassifierType@832['Throwable'] {
     arguments = ArrayList@833[empty]
-    classifier = JavaClassImpl@761['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
-}
-
-LazyJavaClassifierType@834['StringBuilder'] {
-    arguments = ArrayList@835[empty]
-    classifier = JavaClassImpl@797['StringBuilder']
-    nullable = 'true': Boolean@362
-    typeConstructor = LazyJavaClassTypeConstructor@217['StringBuilder']
+    classifier = JavaClassImpl@834['Throwable']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@835
 }
 
 LazyJavaClassifierType@836['Throwable'] {
     arguments = ArrayList@837[empty]
     classifier = JavaClassImpl@838['Throwable']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@839
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@835
 }
 
-LazyJavaClassifierType@840['Throwable'] {
-    arguments = ArrayList@841[empty]
-    classifier = JavaClassImpl@842['Throwable']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@839
+LazyJavaClassifierType@839['Throwable'] {
+    arguments = ArrayList@840[empty]
+    classifier = JavaClassImpl@841['Throwable']
+    nullable = 'false': Boolean@307
+    typeConstructor = DeserializedClassTypeConstructor@835
 }
 
-LazyJavaClassifierType@843['Throwable'] {
-    arguments = ArrayList@844[empty]
-    classifier = JavaClassImpl@845['Throwable']
-    nullable = 'false': Boolean@311
-    typeConstructor = DeserializedClassTypeConstructor@839
+LazyJavaClassifierType@842['Throwable'] {
+    arguments = ArrayList@843[empty]
+    classifier = JavaClassImpl@834['Throwable']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@835
+}
+
+LazyJavaClassifierType@844['Throwable'] {
+    arguments = ArrayList@845[empty]
+    classifier = JavaClassImpl@838['Throwable']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@835
 }
 
 LazyJavaClassifierType@846['Throwable'] {
     arguments = ArrayList@847[empty]
-    classifier = JavaClassImpl@845['Throwable']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@839
+    classifier = JavaClassImpl@841['Throwable']
+    nullable = 'true': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@835
 }
 
-LazyJavaClassifierType@848['Throwable'] {
-    arguments = ArrayList@849[empty]
-    classifier = JavaClassImpl@842['Throwable']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@839
+LazyJavaClassifierType@261['Throwable'] {
+    arguments = ArrayList@848[empty]
+    classifier = JavaClassImpl@849['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@835
 }
 
-LazyJavaClassifierType@850['Throwable'] {
-    arguments = ArrayList@851[empty]
-    classifier = JavaClassImpl@838['Throwable']
-    nullable = 'true': Boolean@362
-    typeConstructor = DeserializedClassTypeConstructor@839
+LazyJavaPackageFragmentProvider@850 {
+    packageFragments('<root>': FqName@851) = LazyJavaPackageFragment@852['<root>']
+    packageFragments('Array': FqName@853) = null
+    packageFragments('ArrayList': FqName@854) = null
+    packageFragments('Char': FqName@855) = null
+    packageFragments('CharSequence': FqName@856) = null
+    packageFragments('Int': FqName@857) = null
+    packageFragments('String': FqName@858) = null
+    packageFragments('StringBuilder': FqName@859) = null
+    packageFragments('System': FqName@860) = null
+    packageFragments('Throwable': FqName@861) = null
+    packageFragments('java': FqName@862) = LazyJavaPackageFragment@863['java']
+    packageFragments('java.io': FqName@864) = LazyJavaPackageFragment@865['io']
+    packageFragments('java.io.Array': FqName@866) = null
+    packageFragments('java.io.ArrayList': FqName@867) = null
+    packageFragments('java.io.Char': FqName@868) = null
+    packageFragments('java.io.CharSequence': FqName@869) = null
+    packageFragments('java.io.Int': FqName@870) = null
+    packageFragments('java.io.String': FqName@871) = null
+    packageFragments('java.io.StringBuilder': FqName@872) = null
+    packageFragments('java.io.System': FqName@873) = null
+    packageFragments('java.io.Throwable': FqName@874) = null
+    packageFragments('java.lang': FqName@875) = LazyJavaPackageFragment@876['lang']
+    packageFragments('java.lang.Array': FqName@877) = null
+    packageFragments('java.lang.ArrayList': FqName@878) = null
+    packageFragments('java.lang.Char': FqName@879) = null
+    packageFragments('java.lang.CharSequence': FqName@880) = null
+    packageFragments('java.lang.Int': FqName@881) = null
+    packageFragments('java.lang.String': FqName@882) = null
+    packageFragments('java.lang.StringBuilder': FqName@883) = null
+    packageFragments('java.lang.System': FqName@884) = null
+    packageFragments('java.lang.Throwable': FqName@885) = null
+    packageFragments('java.nio.charset': FqName@886) = LazyJavaPackageFragment@887['charset']
+    packageFragments('java.util': FqName@888) = LazyJavaPackageFragment@889['util']
+    packageFragments('java.util.Array': FqName@890) = null
+    packageFragments('java.util.ArrayList': FqName@891) = null
+    packageFragments('java.util.Char': FqName@892) = null
+    packageFragments('java.util.CharSequence': FqName@893) = null
+    packageFragments('java.util.Int': FqName@894) = null
+    packageFragments('java.util.String': FqName@895) = null
+    packageFragments('java.util.StringBuilder': FqName@896) = null
+    packageFragments('java.util.System': FqName@897) = null
+    packageFragments('java.util.Throwable': FqName@898) = null
+    packageFragments('kotlin': FqName@899) = null
+    packageFragments('kotlin.Array': FqName@900) = null
+    packageFragments('kotlin.ArrayList': FqName@901) = null
+    packageFragments('kotlin.Char': FqName@902) = null
+    packageFragments('kotlin.CharSequence': FqName@903) = null
+    packageFragments('kotlin.Int': FqName@904) = null
+    packageFragments('kotlin.String': FqName@905) = null
+    packageFragments('kotlin.StringBuilder': FqName@906) = null
+    packageFragments('kotlin.System': FqName@907) = null
+    packageFragments('kotlin.Throwable': FqName@908) = null
+    packageFragments('kotlin.io': FqName@909) = null
+    packageFragments('kotlin.jvm': FqName@910) = null
+    topLevelClasses(JavaClassImpl@305['AbstractCollection']) = LazyJavaClassDescriptor@1['AbstractCollection']
+    topLevelClasses(JavaClassImpl@310['AbstractList']) = LazyJavaClassDescriptor@16['AbstractList']
+    topLevelClasses(JavaClassImpl@313['AbstractStringBuilder']) = LazyJavaClassDescriptor@32['AbstractStringBuilder']
+    topLevelClasses(JavaClassImpl@388['Appendable']) = LazyJavaClassDescriptor@52['Appendable']
+    topLevelClasses(JavaClassImpl@911['ArrayList']) = LazyJavaClassDescriptor@68['ArrayList']
+    topLevelClasses(JavaClassImpl@407['AutoCloseable']) = LazyJavaClassDescriptor@91['AutoCloseable']
+    topLevelClasses(JavaClassImpl@912['BufferedReader']) = LazyJavaClassDescriptor@96['BufferedReader']
+    topLevelClasses(JavaClassImpl@452['Charset']) = LazyJavaClassDescriptor@111['Charset']
+    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@914['InputStreamReader']) = LazyJavaClassDescriptor@131['InputStreamReader']
+    topLevelClasses(JavaClassImpl@659['OutputStream']) = LazyJavaClassDescriptor@139['OutputStream']
+    topLevelClasses(JavaClassImpl@662['PrintStream']) = LazyJavaClassDescriptor@143['PrintStream']
+    topLevelClasses(JavaClassImpl@915['Random']) = LazyJavaClassDescriptor@156['Random']
+    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@916['StringBuilder']) = LazyJavaClassDescriptor@190['StringBuilder']
+    topLevelClasses(JavaClassImpl@917['System']) = LazyJavaClassDescriptor@214['System']
 }
 
-LazyJavaClassifierType@265['Throwable'] {
-    arguments = ArrayList@852[empty]
-    classifier = JavaClassImpl@853['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@839
+LazyJavaPackageFragment@852['<root>'] {
+    classes('Array': Name@918) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('ArrayList': Name@920) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('BufferedReader': Name@921) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('Char': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('CharSequence': Name@923) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('Exception': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('InputStreamReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('Int': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('Random': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('String': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('StringBuilder': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('System': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('Throwable': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('java': Name@935) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@919
+    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('java': Name@940) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@919
+    memberIndex = computeMemberIndex$1@941 // through LazyPackageFragmentScopeForJavaPackage@919
 }
 
-LazyJavaPackageFragmentProvider@854 {
-    packageFragments('<root>': FqName@855) = LazyJavaPackageFragment@856['<root>']
-    packageFragments('Array': FqName@857) = null
-    packageFragments('ArrayList': FqName@858) = null
-    packageFragments('Char': FqName@859) = null
-    packageFragments('CharSequence': FqName@860) = null
-    packageFragments('Int': FqName@861) = null
-    packageFragments('String': FqName@862) = null
-    packageFragments('StringBuilder': FqName@863) = null
-    packageFragments('System': FqName@864) = null
-    packageFragments('Throwable': FqName@865) = null
-    packageFragments('java': FqName@866) = LazyJavaPackageFragment@867['java']
-    packageFragments('java.io': FqName@868) = LazyJavaPackageFragment@869['io']
-    packageFragments('java.io.Array': FqName@870) = null
-    packageFragments('java.io.ArrayList': FqName@871) = null
-    packageFragments('java.io.Char': FqName@872) = null
-    packageFragments('java.io.CharSequence': FqName@873) = null
-    packageFragments('java.io.Int': FqName@874) = null
-    packageFragments('java.io.String': FqName@875) = null
-    packageFragments('java.io.StringBuilder': FqName@876) = null
-    packageFragments('java.io.System': FqName@877) = null
-    packageFragments('java.io.Throwable': FqName@878) = null
-    packageFragments('java.lang': FqName@879) = LazyJavaPackageFragment@880['lang']
-    packageFragments('java.lang.Array': FqName@881) = null
-    packageFragments('java.lang.ArrayList': FqName@882) = null
-    packageFragments('java.lang.Char': FqName@883) = null
-    packageFragments('java.lang.CharSequence': FqName@884) = null
-    packageFragments('java.lang.Int': FqName@885) = null
-    packageFragments('java.lang.String': FqName@886) = null
-    packageFragments('java.lang.StringBuilder': FqName@887) = null
-    packageFragments('java.lang.System': FqName@888) = null
-    packageFragments('java.lang.Throwable': FqName@889) = null
-    packageFragments('java.nio.charset': FqName@890) = LazyJavaPackageFragment@891['charset']
-    packageFragments('java.util': FqName@892) = LazyJavaPackageFragment@893['util']
-    packageFragments('java.util.Array': FqName@894) = null
-    packageFragments('java.util.ArrayList': FqName@895) = null
-    packageFragments('java.util.Char': FqName@896) = null
-    packageFragments('java.util.CharSequence': FqName@897) = null
-    packageFragments('java.util.Int': FqName@898) = null
-    packageFragments('java.util.String': FqName@899) = null
-    packageFragments('java.util.StringBuilder': FqName@900) = null
-    packageFragments('java.util.System': FqName@901) = null
-    packageFragments('java.util.Throwable': FqName@902) = null
-    packageFragments('kotlin': FqName@903) = null
-    packageFragments('kotlin.Array': FqName@904) = null
-    packageFragments('kotlin.ArrayList': FqName@905) = null
-    packageFragments('kotlin.Char': FqName@906) = null
-    packageFragments('kotlin.CharSequence': FqName@907) = null
-    packageFragments('kotlin.Int': FqName@908) = null
-    packageFragments('kotlin.String': FqName@909) = null
-    packageFragments('kotlin.StringBuilder': FqName@910) = null
-    packageFragments('kotlin.System': FqName@911) = null
-    packageFragments('kotlin.Throwable': FqName@912) = null
-    packageFragments('kotlin.io': FqName@913) = null
-    packageFragments('kotlin.jvm': FqName@914) = null
-    topLevelClasses(JavaClassImpl@309['AbstractCollection']) = LazyJavaClassDescriptor@1['AbstractCollection']
-    topLevelClasses(JavaClassImpl@314['AbstractList']) = LazyJavaClassDescriptor@20['AbstractList']
-    topLevelClasses(JavaClassImpl@317['AbstractStringBuilder']) = LazyJavaClassDescriptor@36['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@394['Appendable']) = LazyJavaClassDescriptor@60['Appendable']
-    topLevelClasses(JavaClassImpl@915['ArrayList']) = LazyJavaClassDescriptor@76['ArrayList']
-    topLevelClasses(JavaClassImpl@411['AutoCloseable']) = LazyJavaClassDescriptor@96['AutoCloseable']
-    topLevelClasses(JavaClassImpl@916['BufferedReader']) = LazyJavaClassDescriptor@102['BufferedReader']
-    topLevelClasses(JavaClassImpl@456['Charset']) = LazyJavaClassDescriptor@116['Charset']
-    topLevelClasses(JavaClassImpl@472['Closeable']) = LazyJavaClassDescriptor@118['Closeable']
-    topLevelClasses(JavaClassImpl@917['Exception']) = LazyJavaClassDescriptor@122['Exception']
-    topLevelClasses(JavaClassImpl@564['FilterOutputStream']) = LazyJavaClassDescriptor@130['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@569['InputStream']) = LazyJavaClassDescriptor@134['InputStream']
-    topLevelClasses(JavaClassImpl@918['InputStreamReader']) = LazyJavaClassDescriptor@136['InputStreamReader']
-    topLevelClasses(JavaClassImpl@663['OutputStream']) = LazyJavaClassDescriptor@144['OutputStream']
-    topLevelClasses(JavaClassImpl@666['PrintStream']) = LazyJavaClassDescriptor@148['PrintStream']
-    topLevelClasses(JavaClassImpl@919['Random']) = LazyJavaClassDescriptor@160['Random']
-    topLevelClasses(JavaClassImpl@670['RandomAccess']) = LazyJavaClassDescriptor@175['RandomAccess']
-    topLevelClasses(JavaClassImpl@672['Readable']) = LazyJavaClassDescriptor@179['Readable']
-    topLevelClasses(JavaClassImpl@677['Reader']) = LazyJavaClassDescriptor@183['Reader']
-    topLevelClasses(JavaClassImpl@690['Serializable']) = LazyJavaClassDescriptor@187['Serializable']
-    topLevelClasses(JavaClassImpl@751['StringBuffer']) = LazyJavaClassDescriptor@192['StringBuffer']
-    topLevelClasses(JavaClassImpl@920['StringBuilder']) = LazyJavaClassDescriptor@194['StringBuilder']
-    topLevelClasses(JavaClassImpl@921['System']) = LazyJavaClassDescriptor@218['System']
+LazyJavaPackageFragment@865['io'] {
+    classes('Array': Name@918) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('ArrayList': Name@920) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('BufferedReader': Name@921) = LazyJavaClassDescriptor@96['BufferedReader'] // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('Char': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('CharSequence': Name@923) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('Exception': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('InputStreamReader': Name@925) = LazyJavaClassDescriptor@131['InputStreamReader'] // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('Int': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('Random': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('String': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('StringBuilder': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('System': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('Throwable': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@942
+    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@942
+    memberIndex = computeMemberIndex$1@943 // through LazyPackageFragmentScopeForJavaPackage@942
 }
 
-LazyJavaPackageFragment@856['<root>'] {
-    classes('Array': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('ArrayList': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('BufferedReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('Char': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('CharSequence': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('Exception': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('InputStreamReader': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('Int': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('Random': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('String': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('StringBuilder': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('System': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('Throwable': Name@935) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('add': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('append': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('charAt': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('compareTo': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('contains': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('deleteCharAt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('equals': Name@937) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('evaluate': Name@938) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('evaluateAdd': Name@939) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('evaluateArg': Name@940) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('getMessage': Name@941) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('hasNext': Name@942) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('iterator': Name@943) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('java': Name@944) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('length': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('minus': Name@945) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('next': Name@946) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('nextInt': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('not': Name@947) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('plus': Name@948) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('println': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('rangeTo': Name@949) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('readLine': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('remove': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    classes('takeFirst': Name@950) = null // through LazyPackageFragmentScopeForJavaPackage@923
-    deserializedPackageScope = Empty@951 // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('ArrayList': Name@952) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('BufferedReader': Name@925) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('Exception': Name@928) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('InputStreamReader': Name@929) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('Random': Name@931) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('StringBuilder': Name@953) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('add': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('append': Name@54) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('charAt': Name@44) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('compareTo': Name@936) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('contains': Name@16) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('equals': Name@937) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('evaluate': Name@938) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('evaluateAdd': Name@939) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('evaluateArg': Name@940) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('getMessage': Name@941) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('hasNext': Name@942) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('iterator': Name@943) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('java': Name@954) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('length': Name@50) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('minus': Name@945) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('next': Name@946) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('nextInt': Name@167) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('not': Name@947) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('plus': Name@948) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('println': Name@73) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('rangeTo': Name@949) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('readLine': Name@100) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('remove': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    functions('takeFirst': Name@950) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@923
-    memberIndex = computeMemberIndex$1@955 // through LazyPackageFragmentScopeForJavaPackage@923
+LazyJavaPackageFragment@863['java'] {
+    classes('io': Name@944) = null // through LazyPackageFragmentScopeForJavaPackage@945
+    classes('lang': Name@946) = null // through LazyPackageFragmentScopeForJavaPackage@945
+    classes('util': Name@947) = null // through LazyPackageFragmentScopeForJavaPackage@945
+    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@945
+    functions('io': Name@948) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@945
+    functions('lang': Name@949) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@945
+    functions('util': Name@950) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@945
+    memberIndex = computeMemberIndex$1@951 // through LazyPackageFragmentScopeForJavaPackage@945
 }
 
-LazyJavaPackageFragment@869['io'] {
-    classes('Array': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('ArrayList': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('BufferedReader': Name@925) = LazyJavaClassDescriptor@102['BufferedReader'] // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('Char': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('CharSequence': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('Exception': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('InputStreamReader': Name@929) = LazyJavaClassDescriptor@136['InputStreamReader'] // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('Int': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('Random': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('String': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('StringBuilder': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('System': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('Throwable': Name@935) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('add': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('append': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('charAt': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('compareTo': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('contains': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('deleteCharAt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('equals': Name@937) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('evaluate': Name@938) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('evaluateAdd': Name@939) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('evaluateArg': Name@940) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('getMessage': Name@941) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('hasNext': Name@942) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('iterator': Name@943) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('length': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('minus': Name@945) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('next': Name@946) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('nextInt': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('not': Name@947) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('plus': Name@948) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('println': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('rangeTo': Name@949) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('readLine': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('remove': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    classes('takeFirst': Name@950) = null // through LazyPackageFragmentScopeForJavaPackage@956
-    deserializedPackageScope = Empty@951 // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('ArrayList': Name@952) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('BufferedReader': Name@925) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('Exception': Name@928) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('InputStreamReader': Name@929) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('Random': Name@931) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('StringBuilder': Name@953) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('add': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('append': Name@54) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('charAt': Name@44) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('compareTo': Name@936) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('contains': Name@16) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('equals': Name@937) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('evaluate': Name@938) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('evaluateAdd': Name@939) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('evaluateArg': Name@940) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('getMessage': Name@941) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('hasNext': Name@942) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('iterator': Name@943) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('length': Name@50) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('minus': Name@945) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('next': Name@946) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('nextInt': Name@167) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('not': Name@947) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('plus': Name@948) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('println': Name@73) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('rangeTo': Name@949) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('readLine': Name@100) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('remove': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    functions('takeFirst': Name@950) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@956
-    memberIndex = computeMemberIndex$1@957 // through LazyPackageFragmentScopeForJavaPackage@956
+LazyJavaPackageFragment@876['lang'] {
+    classes('ArrayList': Name@938) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('BufferedReader': Name@921) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('Exception': Name@924) = LazyJavaClassDescriptor@117['Exception'] // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('InputStreamReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('Random': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('StringBuilder': Name@929) = LazyJavaClassDescriptor@190['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('System': Name@930) = LazyJavaClassDescriptor@214['System'] // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@952
+    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@952
+    memberIndex = computeMemberIndex$1@953 // through LazyPackageFragmentScopeForJavaPackage@952
 }
 
-LazyJavaPackageFragment@867['java'] {
-    classes('io': Name@958) = null // through LazyPackageFragmentScopeForJavaPackage@959
-    classes('lang': Name@960) = null // through LazyPackageFragmentScopeForJavaPackage@959
-    classes('util': Name@961) = null // through LazyPackageFragmentScopeForJavaPackage@959
-    deserializedPackageScope = Empty@951 // through LazyPackageFragmentScopeForJavaPackage@959
-    functions('io': Name@962) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@959
-    functions('lang': Name@963) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@959
-    functions('util': Name@964) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@959
-    memberIndex = computeMemberIndex$1@965 // through LazyPackageFragmentScopeForJavaPackage@959
+LazyJavaPackageFragment@889['util'] {
+    classes('Array': Name@918) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('ArrayList': Name@920) = LazyJavaClassDescriptor@68['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('BufferedReader': Name@921) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('Char': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('CharSequence': Name@923) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('Exception': Name@924) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('InputStreamReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('Int': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('Random': Name@927) = LazyJavaClassDescriptor@156['Random'] // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('String': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('StringBuilder': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('System': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('Throwable': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('evaluate': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('evaluateAdd': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('evaluateArg': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    classes('takeFirst': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@954
+    deserializedPackageScope = Empty@937 // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('ArrayList': Name@938) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('BufferedReader': Name@921) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('Exception': Name@924) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('InputStreamReader': Name@925) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('Random': Name@927) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('StringBuilder': Name@939) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('evaluate': Name@932) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('evaluateAdd': Name@933) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('evaluateArg': Name@934) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    functions('takeFirst': Name@936) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@954
+    memberIndex = computeMemberIndex$1@955 // through LazyPackageFragmentScopeForJavaPackage@954
 }
 
-LazyJavaPackageFragment@880['lang'] {
-    classes('ArrayList': Name@952) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('BufferedReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('Exception': Name@928) = LazyJavaClassDescriptor@122['Exception'] // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('InputStreamReader': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('Random': Name@931) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('StringBuilder': Name@933) = LazyJavaClassDescriptor@194['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('System': Name@934) = LazyJavaClassDescriptor@218['System'] // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('add': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('append': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('charAt': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('compareTo': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('contains': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('deleteCharAt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('equals': Name@937) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('evaluate': Name@938) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('evaluateAdd': Name@939) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('evaluateArg': Name@940) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('getMessage': Name@941) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('hasNext': Name@942) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('iterator': Name@943) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('length': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('minus': Name@945) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('next': Name@946) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('nextInt': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('not': Name@947) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('plus': Name@948) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('println': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('rangeTo': Name@949) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('readLine': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('remove': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    classes('takeFirst': Name@950) = null // through LazyPackageFragmentScopeForJavaPackage@966
-    deserializedPackageScope = Empty@951 // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('ArrayList': Name@952) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('BufferedReader': Name@925) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('Exception': Name@928) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('InputStreamReader': Name@929) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('Random': Name@931) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('StringBuilder': Name@953) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('add': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('append': Name@54) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('charAt': Name@44) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('compareTo': Name@936) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('contains': Name@16) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('equals': Name@937) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('evaluate': Name@938) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('evaluateAdd': Name@939) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('evaluateArg': Name@940) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('getMessage': Name@941) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('hasNext': Name@942) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('iterator': Name@943) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('length': Name@50) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('minus': Name@945) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('next': Name@946) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('nextInt': Name@167) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('not': Name@947) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('plus': Name@948) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('println': Name@73) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('rangeTo': Name@949) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('readLine': Name@100) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('remove': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    functions('takeFirst': Name@950) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@966
-    memberIndex = computeMemberIndex$1@967 // through LazyPackageFragmentScopeForJavaPackage@966
+LazyJavaTypeParameterDescriptor@245['E'] {
+    defaultType = JetTypeImpl@956['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@489
+    upperBounds = LinkedHashSet@957[1] { NullableType@958 }
+    upperBoundsAsType = NullableType@958
 }
 
-LazyJavaPackageFragment@893['util'] {
-    classes('Array': Name@922) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('ArrayList': Name@924) = LazyJavaClassDescriptor@76['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('BufferedReader': Name@925) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('Char': Name@926) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('CharSequence': Name@927) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('Exception': Name@928) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('InputStreamReader': Name@929) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('Int': Name@930) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('Random': Name@931) = LazyJavaClassDescriptor@160['Random'] // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('String': Name@932) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('StringBuilder': Name@933) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('System': Name@934) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('Throwable': Name@935) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('add': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('append': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('charAt': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('compareTo': Name@936) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('contains': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('deleteCharAt': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('equals': Name@937) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('evaluate': Name@938) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('evaluateAdd': Name@939) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('evaluateArg': Name@940) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('getMessage': Name@941) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('hasNext': Name@942) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('iterator': Name@943) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('length': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('minus': Name@945) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('next': Name@946) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('nextInt': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('not': Name@947) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('plus': Name@948) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('println': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('rangeTo': Name@949) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('readLine': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('remove': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    classes('takeFirst': Name@950) = null // through LazyPackageFragmentScopeForJavaPackage@968
-    deserializedPackageScope = Empty@951 // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('ArrayList': Name@952) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('BufferedReader': Name@925) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('Exception': Name@928) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('InputStreamReader': Name@929) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('Random': Name@931) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('StringBuilder': Name@953) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('add': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('append': Name@54) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('charAt': Name@44) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('compareTo': Name@936) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('contains': Name@16) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('deleteCharAt': Name@55) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('equals': Name@937) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('evaluate': Name@938) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('evaluateAdd': Name@939) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('evaluateArg': Name@940) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('getMessage': Name@941) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('hasNext': Name@942) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('iterator': Name@943) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('length': Name@50) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('minus': Name@945) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('next': Name@946) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('nextInt': Name@167) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('not': Name@947) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('plus': Name@948) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('println': Name@73) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('rangeTo': Name@949) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('readLine': Name@100) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('remove': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    functions('takeFirst': Name@950) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@968
-    memberIndex = computeMemberIndex$1@969 // through LazyPackageFragmentScopeForJavaPackage@968
+LazyJavaTypeParameterDescriptor@229['E'] {
+    defaultType = JetTypeImpl@959['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@506
+    upperBounds = LinkedHashSet@960[1] { NullableType@961 }
+    upperBoundsAsType = NullableType@961
 }
 
 LazyJavaTypeParameterDescriptor@233['E'] {
-    defaultType = JetTypeImpl@970['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@513
-    upperBounds = LinkedHashSet@971[1] { NullableType@972 }
-    upperBoundsAsType = NullableType@972
+    defaultType = JetTypeImpl@962['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+    upperBounds = LinkedHashSet@963[1] { NullableType@964 }
+    upperBoundsAsType = NullableType@964
 }
 
-LazyJavaTypeParameterDescriptor@249['E'] {
-    defaultType = JetTypeImpl@973['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@497
-    upperBounds = LinkedHashSet@974[1] { NullableType@975 }
-    upperBoundsAsType = NullableType@975
+LazyJavaTypeParameterResolver@965 {
+    resolve(JavaTypeParameterImpl@966['E']) = LazyJavaTypeParameterDescriptor@233['E']
 }
 
-LazyJavaTypeParameterDescriptor@237['E'] {
-    defaultType = JetTypeImpl@976['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@493
-    upperBounds = LinkedHashSet@977[1] { NullableType@978 }
-    upperBoundsAsType = NullableType@978
+LazyJavaTypeParameterResolver@967 {
+    resolve(JavaTypeParameterImpl@968['E']) = LazyJavaTypeParameterDescriptor@229['E']
 }
 
-LazyJavaTypeParameterResolver@979 {
-    resolve(JavaTypeParameterImpl@980['E']) = LazyJavaTypeParameterDescriptor@233['E']
+LazyJavaTypeParameterResolver@969 {
+    resolve(JavaTypeParameterImpl@970['E']) = LazyJavaTypeParameterDescriptor@245['E']
 }
 
-LazyJavaTypeParameterResolver@981 {
-    resolve(JavaTypeParameterImpl@982['E']) = LazyJavaTypeParameterDescriptor@249['E']
+LazyJavaTypeParameterResolver@971 {
+    resolve(JavaTypeParameterImpl@521['E']) = null
 }
 
-LazyJavaTypeParameterResolver@983 {
-    resolve(JavaTypeParameterImpl@984['E']) = LazyJavaTypeParameterDescriptor@237['E']
+LazyJavaTypeParameterResolver@972 {
+    resolve(JavaTypeParameterImpl@492['E']) = null
 }
 
-LazyJavaTypeParameterResolver@985 {
-    resolve(JavaTypeParameterImpl@500['E']) = null
+LazyJavaTypeParameterResolver@973 {
+    resolve(JavaTypeParameterImpl@527['E']) = null
 }
 
-LazyJavaTypeParameterResolver@986 {
-    resolve(JavaTypeParameterImpl@528['E']) = null
+LazyJavaTypeParameterResolver@974 {
+    resolve(JavaTypeParameterImpl@512['E']) = null
 }
 
-LazyJavaTypeParameterResolver@987 {
-    resolve(JavaTypeParameterImpl@525['E']) = null
+LazyJavaTypeParameterResolver@975 {
+    resolve(JavaTypeParameterImpl@524['E']) = null
 }
 
-LazyJavaTypeParameterResolver@988 {
-    resolve(JavaTypeParameterImpl@519['E']) = null
+LazyJavaTypeParameterResolver@976 {
+    resolve(JavaTypeParameterImpl@518['E']) = null
 }
 
-LazyJavaTypeParameterResolver@989 {
-    resolve(JavaTypeParameterImpl@534['E']) = null
-}
-
-LazyJavaTypeParameterResolver@990 {
+LazyJavaTypeParameterResolver@977 {
     resolve(JavaTypeParameterImpl@509['E']) = null
 }
 
-LazyJavaTypeParameterResolver@991 {
-    resolve(JavaTypeParameterImpl@516['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@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@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@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@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, ... }
+}
+
+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@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]
+    <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@1032 {
+    <name not found> = ArrayList@1033[1] { ResolutionCandidate@1034 }
+    <name not found> = ArrayList@1035[1] { ResolutionCandidate@1034 }
+    <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@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]
+    <name not found> = EmptyList@61[empty]
+}
+
+ResolutionTaskHolder@1044 {
+    <name not found> = ArrayList@1045[1] { ResolutionCandidate@1046 }
+    <name not found> = ArrayList@1047[1] { ResolutionCandidate@1046 }
+    <name not found> = EmptyList@61[empty]
+    <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@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@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@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@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@1080 {
+    <name not found> = ArrayList@1081[1] { ResolutionCandidate@1082 }
+    <name not found> = ArrayList@1083[1] { ResolutionCandidate@1082 }
+}
+
+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@1092 {
+    <name not found> = ArrayList@1093[1] { ResolutionCandidate@1094 }
+    <name not found> = ArrayList@1095[1] { ResolutionCandidate@1094 }
+}
+
+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@1104 {
+    <name not found> = ArrayList@1105[1] { ResolutionCandidate@1106 }
+    <name not found> = ArrayList@1107[1] { ResolutionCandidate@1106 }
+}
+
+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@1116 {
+    <name not found> = ArrayList@1117[1] { ResolutionCandidate@1118 }
+    <name not found> = ArrayList@1119[1] { ResolutionCandidate@1118 }
+}
+
+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@1128 {
+    <name not found> = ArrayList@1129[1] { ResolutionCandidate@1130 }
+    <name not found> = ArrayList@1131[1] { ResolutionCandidate@1130 }
+}
+
+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@1140 {
+    <name not found> = ArrayList@1141[1] { ResolutionCandidate@1142 }
+    <name not found> = ArrayList@1143[1] { ResolutionCandidate@1142 }
+}
+
+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@1152 {
+    <name not found> = ArrayList@1153[1] { ResolutionCandidate@1154 }
+    <name not found> = ArrayList@1155[1] { ResolutionCandidate@1154 }
+}
+
+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@1164 {
+    <name not found> = ArrayList@1165[1] { ResolutionCandidate@1166 }
+    <name not found> = ArrayList@1167[1] { ResolutionCandidate@1166 }
+}
+
+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@1176 {
+    <name not found> = ArrayList@1177[1] { ResolutionCandidate@1178 }
+    <name not found> = ArrayList@1179[1] { ResolutionCandidate@1178 }
+}
+
+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@1188 {
+    <name not found> = ArrayList@1189[1] { ResolutionCandidate@1190 }
+    <name not found> = ArrayList@1191[1] { ResolutionCandidate@1190 }
+}
+
+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@1200 {
+    <name not found> = ArrayList@1201[1] { ResolutionCandidate@1202 }
+    <name not found> = ArrayList@1203[1] { ResolutionCandidate@1202 }
+}
+
+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@1212 {
+    <name not found> = ArrayList@1213[1] { ResolutionCandidate@1214 }
+    <name not found> = ArrayList@1215[1] { ResolutionCandidate@1214 }
+}
+
+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@1224 {
+    <name not found> = ArrayList@1225[1] { ResolutionCandidate@1226 }
+    <name not found> = ArrayList@1227[1] { ResolutionCandidate@1226 }
+}
+
+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@1236 {
+    <name not found> = ArrayList@1237[1] { ResolutionCandidate@1238 }
+    <name not found> = ArrayList@1239[1] { ResolutionCandidate@1238 }
+}
+
+ResolutionTaskHolder@1240 {
+    <name not found> = ArrayList@1241[1] { ResolutionCandidate@1242 }
+    <name not found> = ArrayList@1243[1] { ResolutionCandidate@1242 }
+}
+
+ResolutionTaskHolder@1244 {
+    <name not found> = ArrayList@1245[1] { ResolutionCandidate@1246 }
+    <name not found> = ArrayList@1247[1] { ResolutionCandidate@1246 }
+}
+
+ResolutionTaskHolder@1248 {
+    <name not found> = ArrayList@1249[1] { ResolutionCandidate@1250 }
+    <name not found> = ArrayList@1251[1] { ResolutionCandidate@1250 }
+}
+
+ResolutionTaskHolder@1252 {
+    <name not found> = ArrayList@1253[1] { ResolutionCandidate@1254 }
+    <name not found> = ArrayList@1255[1] { ResolutionCandidate@1254 }
+}
+
+ResolutionTaskHolder@1256 {
+    <name not found> = ArrayList@1257[1] { ResolutionCandidate@1258 }
+    <name not found> = ArrayList@1259[1] { ResolutionCandidate@1258 }
+}
+
+ResolutionTaskHolder@1260 {
+    <name not found> = ArrayList@1261[1] { ResolutionCandidate@1262 }
+    <name not found> = ArrayList@1263[1] { ResolutionCandidate@1262 }
+}
+
+ResolutionTaskHolder@1264 {
+    <name not found> = ArrayList@1265[1] { ResolutionCandidate@1266 }
+    <name not found> = ArrayList@1267[1] { ResolutionCandidate@1266 }
+}
+
+ResolutionTaskHolder@1268 {
+    <name not found> = ArrayList@1269[1] { ResolutionCandidate@1270 }
+    <name not found> = ArrayList@1271[1] { ResolutionCandidate@1270 }
+}
+
+ResolutionTaskHolder@1272 {
+    <name not found> = ArrayList@1273[1] { ResolutionCandidate@1274 }
+    <name not found> = ArrayList@1275[1] { ResolutionCandidate@1274 }
+}
+
+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@1284 {
+    <name not found> = ArrayList@1285[1] { ResolutionCandidate@1286 }
+    <name not found> = ArrayList@1287[1] { ResolutionCandidate@1286 }
+}
+
+ResolutionTaskHolder@1288 {
+    <name not found> = ArrayList@1289[1] { ResolutionCandidate@1290 }
+    <name not found> = ArrayList@1291[1] { ResolutionCandidate@1290 }
+}
+
+ResolutionTaskHolder@1292 {
+    <name not found> = ArrayList@1293[1] { ResolutionCandidate@1294 }
+    <name not found> = ArrayList@1295[1] { ResolutionCandidate@1294 }
+}
+
+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@1304 {
+    <name not found> = ArrayList@1305[1] { ResolutionCandidate@1306 }
+    <name not found> = ArrayList@1307[1] { ResolutionCandidate@1306 }
+}
+
+ResolutionTaskHolder@1308 {
+    <name not found> = ArrayList@1309[1] { ResolutionCandidate@1310 }
+    <name not found> = ArrayList@1311[1] { ResolutionCandidate@1310 }
+}
+
+ResolutionTaskHolder@1312 {
+    <name not found> = ArrayList@1313[1] { ResolutionCandidate@1314 }
+    <name not found> = ArrayList@1315[2] { ResolutionCandidate@1316, ResolutionCandidate@1314 }
+}
+
+ResolutionTaskHolder@1317 {
+    <name not found> = ArrayList@1318[2] { ResolutionCandidate@1319, ResolutionCandidate@1320 }
+    <name not found> = ArrayList@1321[2] { ResolutionCandidate@1319, ResolutionCandidate@1320 }
+    <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 }
+    <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]
+    <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@1433 {
+    <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@1434 {
+    <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@1435 {
+    <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@1436 {
+    <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@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 {
+    <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 2e29560a126..7bba66bc911 100644
--- a/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/ErrorsOnIbjectExpressionsAsParameters.lazy.log
@@ -35,3 +35,12 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': 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> = 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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
index e1cd429901f..93471b7de2a 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet11.lazy.log
@@ -17,3 +17,8 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
     memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
 }
+
+ResolutionTaskHolder@20 {
+    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+    <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 4faea28e8ae..e43030a76d8 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet121.lazy.log
@@ -29,16 +29,88 @@ LazyJavaPackageFragment@7['java'] {
 
 LazyJavaPackageFragment@9['lang'] {
     classes('apply': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('f': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('length': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('f': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('get': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('invoke': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('length': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
     deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
     functions('apply': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('f': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('get': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('f': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('get': Name@29) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('invoke': Name@30) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <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[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]
+    <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 }
+    <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> = 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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
index 428faae6716..ccc8fccc085 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet124.lazy.log
@@ -14,32 +14,66 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
     classes('foo1': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
     classes('h': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('invoke': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('m': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('foo1': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('h': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('invoke': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('m': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('m': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('foo1': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('h': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('m': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('foo1': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('h': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('invoke': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('m': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo1': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('h': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('invoke': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('m': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('foo1': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('h': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('m': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('foo1': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('h': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('m': 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> = 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@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@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@47 {
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@49 }
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@49 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
index cdb1eb0d718..23614539dc5 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet169.lazy.log
@@ -20,30 +20,61 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Any': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
     classes('String': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('compareTo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('toString': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('compareTo': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('get': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('toString': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@19
+    classes('toString': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('toString': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('compareTo': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    classes('toString': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
-    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('compareTo': Name@21) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('get': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    functions('toString': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('toString': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('toString': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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]
+}
+
+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@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@54 {
+    <name not found> = ArrayList@55[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[2] { ResolutionCandidate@56, ResolutionCandidate@57 }
+}
+
+ResolutionTaskHolder@59 {
+    <name not found> = ArrayList@60[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
+    <name not found> = ArrayList@63[2] { ResolutionCandidate@61, ResolutionCandidate@62 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
index 586d576773b..004e949683b 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet17.lazy.log
@@ -31,3 +31,10 @@ LazyJavaPackageFragment@11['lang'] {
     classes('a': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
index 7363173e4d1..238ded416c6 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183-1.lazy.log
@@ -20,26 +20,346 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('String': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('signal': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('signal': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('equals': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('signal': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('equals': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('signal': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+    <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]
+}
+
+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@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@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 }
+}
+
+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> = 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@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@89 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 dd7bd46fffc..98214764fd2 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet183.lazy.log
@@ -29,3 +29,243 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <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]
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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@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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
index 103ee31fcd2..34bd0c63949 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet53.lazy.log
@@ -58,14 +58,14 @@ LazyJavaClassifierType@36['T'] {
 
 LazyJavaClassifierType@39['T'] {
     arguments = ArrayList@40[empty]
-    classifier = JavaTypeParameterImpl@34['T']
+    classifier = JavaTypeParameterImpl@38['T']
     nullable = 'true': Boolean@27
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
 }
 
 LazyJavaClassifierType@41['T'] {
     arguments = ArrayList@42[empty]
-    classifier = JavaTypeParameterImpl@38['T']
+    classifier = JavaTypeParameterImpl@34['T']
     nullable = 'true': Boolean@27
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
 }
@@ -131,3 +131,25 @@ LazyJavaTypeParameterDescriptor@86['T'] {
 LazyJavaTypeParameterResolver@89 {
     resolve(JavaTypeParameterImpl@90['T']) = LazyJavaTypeParameterDescriptor@86['T']
 }
+
+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]
+    <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]
+    <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/Jet68.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
index 1e87b7b7b9c..794ee60ccdd 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet68.lazy.log
@@ -30,3 +30,31 @@ LazyJavaPackageFragment@7['lang'] {
     functions('equals': Name@13) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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> = EmptyList@16[empty]
+}
+
+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@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 a25eb467dc5..c89b287add3 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet69.lazy.log
@@ -50,3 +50,31 @@ LazyJavaPackageFragment@11['lang'] {
     functions('parse': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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@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@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/Jet72.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
index 8cd30946b33..63cc0c8c89e 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet72.lazy.log
@@ -2,96 +2,85 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     defaultType = JetTypeImpl@1['AbstractCollection<1>']
     functions('iterator': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['iterator'] } // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('iterator': 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['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('iterator': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['iterator'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@16
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+LazyJavaClassDescriptor@9['AbstractList'] {
+    defaultType = JetTypeImpl@10['AbstractList<1>']
+    functions('iterator': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['iterator'] } // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@16['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
-LazyJavaClassDescriptor@20['Appendable'] {
-    functions('println': Name@21) = EmptyList@8[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('println': Name@24) = EmptyList@8[empty] // through LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassDescriptor@18['Appendable'] {
+    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@21
+    memberIndex = computeMemberIndex$1@22 // through LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassDescriptor@26['ArrayList'] {
-    constructors = ArrayList@27[3] { JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'], JavaConstructorDescriptor@30['<init>'] } // through LazyJavaClassMemberScope@31
-    defaultType = JetTypeImpl@32['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@33 // through LazyJavaClassMemberScope@31
+LazyJavaClassDescriptor@24['ArrayList'] {
+    constructors = ArrayList@25[3] { JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'] } // through LazyJavaClassMemberScope@29
+    defaultType = JetTypeImpl@30['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@29
     functionTypeForSamInterface = null
-    functions('iterator': Name@7) = ArrayList@34[1] { JavaMethodDescriptor@35['iterator'] } // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@36 // through LazyJavaClassMemberScope@31
-    nestedClassIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@31
-    nestedClasses('iterator': Name@7) = null // through LazyJavaClassMemberScope@31
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@31
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['ArrayList']
+    functions('iterator': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['iterator'] } // through LazyJavaClassMemberScope@29
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
+    nestedClasses('iterator': Name@32) = null // through LazyJavaClassMemberScope@29
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@38['ArrayList']
 }
 
-LazyJavaClassDescriptor@40['AutoCloseable'] {
-    functions('println': Name@21) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('println': Name@24) = EmptyList@8[empty] // through LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['AutoCloseable']
+LazyJavaClassDescriptor@39['AutoCloseable'] {
+    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@40
+    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
+    typeConstructor = LazyJavaClassTypeConstructor@42['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@44['Closeable'] {
-    functions('println': Name@21) = EmptyList@8[empty] // through LazyJavaClassMemberScope@45
-    memberIndex = computeMemberIndex$1@46 // through LazyJavaClassMemberScope@45
-    properties('println': Name@24) = EmptyList@8[empty] // through LazyJavaClassMemberScope@45
-    typeConstructor = LazyJavaClassTypeConstructor@47['Closeable']
+LazyJavaClassDescriptor@43['Closeable'] {
+    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@44
+    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
+    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
 }
 
-LazyJavaClassDescriptor@48['FilterOutputStream'] {
-    functions('println': Name@21) = EmptyList@8[empty] // through LazyJavaClassMemberScope@49
-    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
-    properties('println': Name@24) = EmptyList@8[empty] // through LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['FilterOutputStream']
+LazyJavaClassDescriptor@47['FilterOutputStream'] {
+    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@48
+    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@48
+    typeConstructor = LazyJavaClassTypeConstructor@50['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@52['Object'] {
-    typeConstructor = LazyJavaClassTypeConstructor@53['Object']
+LazyJavaClassDescriptor@51['Object'] {
+    typeConstructor = LazyJavaClassTypeConstructor@52['Object']
 }
 
-LazyJavaClassDescriptor@54['OutputStream'] {
-    functions('println': Name@21) = EmptyList@8[empty] // through LazyJavaClassMemberScope@55
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaClassMemberScope@55
-    properties('println': Name@24) = EmptyList@8[empty] // through LazyJavaClassMemberScope@55
-    typeConstructor = LazyJavaClassTypeConstructor@57['OutputStream']
+LazyJavaClassDescriptor@53['OutputStream'] {
+    functions('println': Name@19) = EmptyList@20[empty] // through LazyJavaClassMemberScope@54
+    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
+    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
 }
 
-LazyJavaClassDescriptor@58['PrintStream'] {
-    defaultType = JetTypeImpl@59['PrintStream']
-    enumEntryIndex = LinkedHashMap@60 // through LazyJavaClassMemberScope@61
-    functions('println': Name@24) = ArrayList@62[10] { JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], ... } // through LazyJavaClassMemberScope@61
-    memberIndex = computeMemberIndex$1@66 // through LazyJavaClassMemberScope@61
-    nestedClassIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@61
-    nestedClasses('println': Name@24) = null // through LazyJavaClassMemberScope@61
-    properties('println': Name@24) = EmptyList@8[empty] // through LazyJavaClassMemberScope@61
+LazyJavaClassDescriptor@57['PrintStream'] {
+    defaultType = JetTypeImpl@58['PrintStream']
+    enumEntryIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@60
+    functions('println': Name@61) = ArrayList@62[10] { JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], ... } // through LazyJavaClassMemberScope@60
+    memberIndex = computeMemberIndex$1@66 // through LazyJavaClassMemberScope@60
+    nestedClassIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@60
+    nestedClasses('println': Name@61) = null // through LazyJavaClassMemberScope@60
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@68['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
 }
 
 LazyJavaClassDescriptor@70['RandomAccess'] {
-    functions('iterator': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@71
+    functions('iterator': Name@11) = EmptyList@20[empty] // through LazyJavaClassMemberScope@71
     memberIndex = computeMemberIndex$1@72 // through LazyJavaClassMemberScope@71
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@71
     typeConstructor = LazyJavaClassTypeConstructor@73['RandomAccess']
 }
 
 LazyJavaClassDescriptor@74['Serializable'] {
-    functions('iterator': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@75
+    functions('iterator': Name@11) = EmptyList@20[empty] // through LazyJavaClassMemberScope@75
     memberIndex = computeMemberIndex$1@76 // through LazyJavaClassMemberScope@75
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@75
     typeConstructor = LazyJavaClassTypeConstructor@77['Serializable']
 }
 
@@ -102,51 +91,51 @@ LazyJavaClassDescriptor@78['System'] {
     nestedClassIndex = LinkedHashMap@84 // through LazyJavaClassMemberScope@80
     nestedClasses('out': Name@85) = null // through LazyJavaClassMemberScope@80
     properties('out': Name@85) = ArrayList@86[1] { JavaPropertyDescriptor@87['out'] } // through LazyJavaStaticClassScope@83
-    properties('out': Name@85) = EmptyList@8[empty] // through LazyJavaClassMemberScope@80
+    properties('out': Name@85) = EmptyList@20[empty] // through LazyJavaClassMemberScope@80
     typeConstructor = LazyJavaClassTypeConstructor@88['System']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@89[1] { LazyJavaTypeParameterDescriptor@90['E'] }
     supertypes = ArrayList@91[1] { LazyJavaClassifierType@92['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@19['AbstractList'] {
+LazyJavaClassTypeConstructor@17['AbstractList'] {
     parameters = ArrayList@93[1] { LazyJavaTypeParameterDescriptor@94['E'] }
     supertypes = ArrayList@95[2] { LazyJavaClassifierType@96['AbstractCollection<E>'], LazyJavaClassifierType@97['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@25['Appendable'] {
+LazyJavaClassTypeConstructor@23['Appendable'] {
     parameters = ArrayList@98[empty]
     supertypes = ArrayList@99[1] { JetTypeImpl@100['Any'] }
 }
 
-LazyJavaClassTypeConstructor@39['ArrayList'] {
+LazyJavaClassTypeConstructor@38['ArrayList'] {
     parameters = ArrayList@101[1] { LazyJavaTypeParameterDescriptor@102['E'] }
     supertypes = ArrayList@103[5] { LazyJavaClassifierType@104['AbstractList<E>'], LazyJavaClassifierType@105['List<E>'], LazyJavaClassifierType@106['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@43['AutoCloseable'] {
+LazyJavaClassTypeConstructor@42['AutoCloseable'] {
     parameters = ArrayList@107[empty]
     supertypes = ArrayList@108[1] { JetTypeImpl@100['Any'] }
 }
 
-LazyJavaClassTypeConstructor@47['Closeable'] {
+LazyJavaClassTypeConstructor@46['Closeable'] {
     parameters = ArrayList@109[empty]
     supertypes = ArrayList@110[1] { LazyJavaClassifierType@111['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@51['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@50['FilterOutputStream'] {
     parameters = ArrayList@112[empty]
     supertypes = ArrayList@113[1] { LazyJavaClassifierType@114['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@53['Object'] {
+LazyJavaClassTypeConstructor@52['Object'] {
     parameters = ArrayList@115[empty]
     supertypes = ArrayList@116[1] { JetTypeImpl@100['Any'] }
 }
 
-LazyJavaClassTypeConstructor@57['OutputStream'] {
+LazyJavaClassTypeConstructor@56['OutputStream'] {
     parameters = ArrayList@117[empty]
     supertypes = ArrayList@118[1] { LazyJavaClassifierType@119['Closeable'] }
 }
@@ -174,28 +163,28 @@ LazyJavaClassifierType@96['AbstractCollection<E>'] {
     arguments = ArrayList@130[1] { TypeProjectionImpl@131 }
     classifier = JavaClassImpl@132['AbstractCollection']
     memberScope = SubstitutingScope@133
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@104['AbstractList<E>'] {
     arguments = ArrayList@134[1] { TypeProjectionImpl@135 }
     classifier = JavaClassImpl@136['AbstractList']
     memberScope = SubstitutingScope@137
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
 LazyJavaClassifierType@123['Appendable'] {
     arguments = ArrayList@138[empty]
     classifier = JavaClassImpl@139['Appendable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+    memberScope = LazyJavaClassMemberScope@21
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
 LazyJavaClassifierType@111['AutoCloseable'] {
     arguments = ArrayList@140[empty]
     classifier = JavaClassImpl@141['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@40
+    typeConstructor = LazyJavaClassTypeConstructor@42['AutoCloseable']
 }
 
 LazyJavaClassifierType@142['Cloneable'] {
@@ -205,18 +194,18 @@ LazyJavaClassifierType@142['Cloneable'] {
     typeConstructor = DeserializedClassTypeConstructor@146
 }
 
-LazyJavaClassifierType@119['Closeable'] {
+LazyJavaClassifierType@124['Closeable'] {
     arguments = ArrayList@147[empty]
     classifier = JavaClassImpl@148['Closeable']
-    memberScope = LazyJavaClassMemberScope@45
-    typeConstructor = LazyJavaClassTypeConstructor@47['Closeable']
+    memberScope = LazyJavaClassMemberScope@44
+    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
 }
 
-LazyJavaClassifierType@124['Closeable'] {
+LazyJavaClassifierType@119['Closeable'] {
     arguments = ArrayList@149[empty]
     classifier = JavaClassImpl@150['Closeable']
-    memberScope = LazyJavaClassMemberScope@45
-    typeConstructor = LazyJavaClassTypeConstructor@47['Closeable']
+    memberScope = LazyJavaClassMemberScope@44
+    typeConstructor = LazyJavaClassTypeConstructor@46['Closeable']
 }
 
 LazyJavaClassifierType@151['Collection<? extends E>'] {
@@ -260,14 +249,14 @@ LazyJavaClassifierType@175['E'] {
     arguments = ArrayList@176[empty]
     classifier = JavaTypeParameterImpl@177['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
-LazyJavaClassifierType@178['E'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaTypeParameterImpl@180['E']
+LazyJavaClassifierType@179['E'] {
+    arguments = ArrayList@180[empty]
+    classifier = JavaTypeParameterImpl@181['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@182['E'] {
@@ -288,28 +277,28 @@ LazyJavaClassifierType@189['E'] {
     arguments = ArrayList@190[empty]
     classifier = JavaTypeParameterImpl@191['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@192['E'] {
     arguments = ArrayList@193[empty]
     classifier = JavaTypeParameterImpl@194['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@195['E'] {
     arguments = ArrayList@196[empty]
     classifier = JavaTypeParameterImpl@197['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@198['E'] {
     arguments = ArrayList@199[empty]
     classifier = JavaTypeParameterImpl@200['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@201['E'] {
@@ -323,42 +312,42 @@ LazyJavaClassifierType@204['E'] {
     arguments = ArrayList@205[empty]
     classifier = JavaTypeParameterImpl@206['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
 }
 
 LazyJavaClassifierType@207['E'] {
     arguments = ArrayList@208[empty]
     classifier = JavaTypeParameterImpl@209['E']
     nullable = 'false': Boolean@156
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
 }
 
 LazyJavaClassifierType@210['E'] {
     arguments = ArrayList@211[empty]
     classifier = JavaTypeParameterImpl@209['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
 }
 
 LazyJavaClassifierType@212['E'] {
     arguments = ArrayList@213[empty]
-    classifier = JavaTypeParameterImpl@197['E']
+    classifier = JavaTypeParameterImpl@188['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@214['E'] {
     arguments = ArrayList@215[empty]
-    classifier = JavaTypeParameterImpl@174['E']
+    classifier = JavaTypeParameterImpl@197['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@216['E'] {
     arguments = ArrayList@217[empty]
-    classifier = JavaTypeParameterImpl@191['E']
+    classifier = JavaTypeParameterImpl@200['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@218['E'] {
@@ -372,63 +361,63 @@ LazyJavaClassifierType@220['E'] {
     arguments = ArrayList@221[empty]
     classifier = JavaTypeParameterImpl@194['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
 }
 
 LazyJavaClassifierType@222['E'] {
     arguments = ArrayList@223[empty]
-    classifier = JavaTypeParameterImpl@206['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
-}
-
-LazyJavaClassifierType@224['E'] {
-    arguments = ArrayList@225[empty]
-    classifier = JavaTypeParameterImpl@188['E']
+    classifier = JavaTypeParameterImpl@191['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@200['E']
+    classifier = JavaTypeParameterImpl@206['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
 }
 
 LazyJavaClassifierType@228['E'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@180['E']
+    classifier = JavaTypeParameterImpl@174['E']
     nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@230['E'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@177['E']
+    classifier = JavaTypeParameterImpl@170['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
 }
 
 LazyJavaClassifierType@232['E'] {
     arguments = ArrayList@233[empty]
+    classifier = JavaTypeParameterImpl@181['E']
+    nullable = 'true': Boolean@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+}
+
+LazyJavaClassifierType@234['E'] {
+    arguments = ArrayList@235[empty]
     classifier = JavaTypeParameterImpl@203['E']
     nullable = 'true': Boolean@162
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
 }
 
-LazyJavaClassifierType@234['E'] {
-    arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@170['E']
-    nullable = 'true': Boolean@162
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
-}
-
 LazyJavaClassifierType@122['FilterOutputStream'] {
     arguments = ArrayList@236[empty]
     classifier = JavaClassImpl@237['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@49
-    typeConstructor = LazyJavaClassTypeConstructor@51['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@48
+    typeConstructor = LazyJavaClassTypeConstructor@50['FilterOutputStream']
 }
 
 LazyJavaClassifierType@238['Flushable'] {
@@ -484,14 +473,14 @@ LazyJavaClassifierType@265['Iterator<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@260
 }
 
-LazyJavaClassifierType@97['List<E>'] {
+LazyJavaClassifierType@105['List<E>'] {
     arguments = ArrayList@269[1] { TypeProjectionImpl@270 }
     classifier = JavaClassImpl@271['List']
     memberScope = SubstitutingScope@272
     typeConstructor = DeserializedClassTypeConstructor@273
 }
 
-LazyJavaClassifierType@105['List<E>'] {
+LazyJavaClassifierType@97['List<E>'] {
     arguments = ArrayList@274[1] { TypeProjectionImpl@275 }
     classifier = JavaClassImpl@276['List']
     memberScope = SubstitutingScope@277
@@ -550,14 +539,14 @@ LazyJavaClassifierType@296['Object'] {
 LazyJavaClassifierType@114['OutputStream'] {
     arguments = ArrayList@298[empty]
     classifier = JavaClassImpl@299['OutputStream']
-    memberScope = LazyJavaClassMemberScope@55
-    typeConstructor = LazyJavaClassTypeConstructor@57['OutputStream']
+    memberScope = LazyJavaClassMemberScope@54
+    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
 }
 
 LazyJavaClassifierType@300['PrintStream'] {
     arguments = ArrayList@301[empty]
     classifier = JavaClassImpl@302['PrintStream']
-    memberScope = LazyJavaClassMemberScope@61
+    memberScope = LazyJavaClassMemberScope@60
     nullable = 'false': Boolean@156
     typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
 }
@@ -624,15 +613,15 @@ LazyJavaPackageFragmentProvider@316 {
     packageFragments('kotlin.io': FqName@345) = null
     packageFragments('kotlin.jvm': FqName@346) = null
     topLevelClasses(JavaClassImpl@132['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@136['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@139['Appendable']) = LazyJavaClassDescriptor@20['Appendable']
-    topLevelClasses(JavaClassImpl@347['ArrayList']) = LazyJavaClassDescriptor@26['ArrayList']
-    topLevelClasses(JavaClassImpl@141['AutoCloseable']) = LazyJavaClassDescriptor@40['AutoCloseable']
-    topLevelClasses(JavaClassImpl@150['Closeable']) = LazyJavaClassDescriptor@44['Closeable']
-    topLevelClasses(JavaClassImpl@237['FilterOutputStream']) = LazyJavaClassDescriptor@48['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@348['Object']) = LazyJavaClassDescriptor@52['Object']
-    topLevelClasses(JavaClassImpl@299['OutputStream']) = LazyJavaClassDescriptor@54['OutputStream']
-    topLevelClasses(JavaClassImpl@302['PrintStream']) = LazyJavaClassDescriptor@58['PrintStream']
+    topLevelClasses(JavaClassImpl@136['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
+    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@237['FilterOutputStream']) = LazyJavaClassDescriptor@47['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@348['Object']) = LazyJavaClassDescriptor@51['Object']
+    topLevelClasses(JavaClassImpl@299['OutputStream']) = LazyJavaClassDescriptor@53['OutputStream']
+    topLevelClasses(JavaClassImpl@302['PrintStream']) = LazyJavaClassDescriptor@57['PrintStream']
     topLevelClasses(JavaClassImpl@306['RandomAccess']) = LazyJavaClassDescriptor@70['RandomAccess']
     topLevelClasses(JavaClassImpl@309['Serializable']) = LazyJavaClassDescriptor@74['Serializable']
     topLevelClasses(JavaClassImpl@349['System']) = LazyJavaClassDescriptor@78['System']
@@ -643,100 +632,166 @@ LazyJavaPackageFragment@318['<root>'] {
     classes('Object': Name@352) = null // through LazyPackageFragmentScopeForJavaPackage@351
     classes('String': Name@353) = null // through LazyPackageFragmentScopeForJavaPackage@351
     classes('System': Name@354) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('hasNext': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('items': Name@356) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('iterator': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('java': Name@357) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('next': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('plus': Name@359) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    classes('println': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@351
-    deserializedPackageScope = Empty@360 // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('ArrayList': Name@361) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('hasNext': Name@355) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('iterator': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('java': Name@362) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('next': Name@358) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('plus': Name@359) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    functions('println': Name@24) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@351
-    memberIndex = computeMemberIndex$1@363 // through LazyPackageFragmentScopeForJavaPackage@351
+    classes('items': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@351
+    classes('java': Name@356) = null // through LazyPackageFragmentScopeForJavaPackage@351
+    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@351
+    functions('ArrayList': Name@358) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@351
+    functions('java': Name@359) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@351
+    memberIndex = computeMemberIndex$1@360 // through LazyPackageFragmentScopeForJavaPackage@351
 }
 
 LazyJavaPackageFragment@326['java'] {
-    classes('lang': Name@364) = null // through LazyPackageFragmentScopeForJavaPackage@365
-    classes('util': Name@366) = null // through LazyPackageFragmentScopeForJavaPackage@365
-    deserializedPackageScope = Empty@360 // through LazyPackageFragmentScopeForJavaPackage@365
-    functions('lang': Name@367) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@365
-    functions('util': Name@368) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@365
-    memberIndex = computeMemberIndex$1@369 // through LazyPackageFragmentScopeForJavaPackage@365
+    classes('lang': Name@361) = null // through LazyPackageFragmentScopeForJavaPackage@362
+    classes('util': Name@363) = null // through LazyPackageFragmentScopeForJavaPackage@362
+    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@362
+    functions('lang': Name@364) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@362
+    functions('util': Name@365) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@362
+    memberIndex = computeMemberIndex$1@366 // through LazyPackageFragmentScopeForJavaPackage@362
 }
 
 LazyJavaPackageFragment@330['lang'] {
-    classes('ArrayList': Name@361) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Object': Name@352) = LazyJavaClassDescriptor@52['Object'] // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('System': Name@354) = LazyJavaClassDescriptor@78['System'] // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('hasNext': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('items': Name@356) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('iterator': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('next': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('plus': Name@359) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('println': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    deserializedPackageScope = Empty@360 // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('ArrayList': Name@361) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('hasNext': Name@355) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('iterator': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('next': Name@358) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('plus': Name@359) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('println': Name@24) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    memberIndex = computeMemberIndex$1@371 // through LazyPackageFragmentScopeForJavaPackage@370
+    classes('ArrayList': Name@358) = null // through LazyPackageFragmentScopeForJavaPackage@367
+    classes('Object': Name@352) = LazyJavaClassDescriptor@51['Object'] // through LazyPackageFragmentScopeForJavaPackage@367
+    classes('System': Name@354) = LazyJavaClassDescriptor@78['System'] // through LazyPackageFragmentScopeForJavaPackage@367
+    classes('items': Name@355) = null // through LazyPackageFragmentScopeForJavaPackage@367
+    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@367
+    functions('ArrayList': Name@358) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@367
+    memberIndex = computeMemberIndex$1@368 // through LazyPackageFragmentScopeForJavaPackage@367
 }
 
 LazyJavaPackageFragment@337['util'] {
-    classes('ArrayList': Name@372) = LazyJavaClassDescriptor@26['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@373
-    deserializedPackageScope = Empty@360 // through LazyPackageFragmentScopeForJavaPackage@373
-    functions('ArrayList': Name@374) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@373
-    memberIndex = computeMemberIndex$1@375 // through LazyPackageFragmentScopeForJavaPackage@373
+    classes('ArrayList': Name@369) = LazyJavaClassDescriptor@24['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@370
+    deserializedPackageScope = Empty@357 // through LazyPackageFragmentScopeForJavaPackage@370
+    functions('ArrayList': Name@371) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@370
+    memberIndex = computeMemberIndex$1@372 // through LazyPackageFragmentScopeForJavaPackage@370
+}
+
+LazyJavaTypeParameterDescriptor@90['E'] {
+    defaultType = JetTypeImpl@373['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@178
+    upperBounds = LinkedHashSet@374[1] { NullableType@375 }
+    upperBoundsAsType = NullableType@375
 }
 
 LazyJavaTypeParameterDescriptor@94['E'] {
     defaultType = JetTypeImpl@376['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
     upperBounds = LinkedHashSet@377[1] { NullableType@378 }
     upperBoundsAsType = NullableType@378
 }
 
-LazyJavaTypeParameterDescriptor@90['E'] {
-    defaultType = JetTypeImpl@379['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@185
-    upperBounds = LinkedHashSet@380[1] { NullableType@381 }
-    upperBoundsAsType = NullableType@381
-}
-
 LazyJavaTypeParameterDescriptor@102['E'] {
-    defaultType = JetTypeImpl@382['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@181
-    upperBounds = LinkedHashSet@383[1] { NullableType@384 }
+    defaultType = JetTypeImpl@379['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@171
+    upperBounds = LinkedHashSet@380[1] { NullableType@381 }
 }
 
-LazyJavaTypeParameterResolver@385 {
-    resolve(JavaTypeParameterImpl@386['E']) = LazyJavaTypeParameterDescriptor@94['E']
+LazyJavaTypeParameterResolver@382 {
+    resolve(JavaTypeParameterImpl@383['E']) = LazyJavaTypeParameterDescriptor@90['E']
 }
 
-LazyJavaTypeParameterResolver@387 {
-    resolve(JavaTypeParameterImpl@388['E']) = LazyJavaTypeParameterDescriptor@102['E']
+LazyJavaTypeParameterResolver@384 {
+    resolve(JavaTypeParameterImpl@385['E']) = LazyJavaTypeParameterDescriptor@102['E']
+}
+
+LazyJavaTypeParameterResolver@386 {
+    resolve(JavaTypeParameterImpl@387['E']) = LazyJavaTypeParameterDescriptor@94['E']
+}
+
+LazyJavaTypeParameterResolver@388 {
+    resolve(JavaTypeParameterImpl@209['E']) = null
 }
 
 LazyJavaTypeParameterResolver@389 {
-    resolve(JavaTypeParameterImpl@390['E']) = LazyJavaTypeParameterDescriptor@90['E']
+    resolve(JavaTypeParameterImpl@177['E']) = null
 }
 
-LazyJavaTypeParameterResolver@391 {
-    resolve(JavaTypeParameterImpl@203['E']) = null
+LazyJavaTypeParameterResolver@390 {
+    resolve(JavaTypeParameterImpl@191['E']) = null
 }
 
-LazyJavaTypeParameterResolver@392 {
-    resolve(JavaTypeParameterImpl@194['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, ... }
 }
 
-LazyJavaTypeParameterResolver@393 {
-    resolve(JavaTypeParameterImpl@174['E']) = null
+ResolutionTaskHolder@397 {
+    <name not found> = ArrayList@398[1] { ResolutionCandidate@399 }
+    <name not found> = ArrayList@400[1] { ResolutionCandidate@399 }
+    <name not found> = EmptyList@20[empty]
+    <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]
+    <name not found> = EmptyList@20[empty]
+}
+
+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[3] { ResolutionCandidate@443, ResolutionCandidate@444, ResolutionCandidate@445 }
+    <name not found> = ArrayList@446[3] { ResolutionCandidate@443, ResolutionCandidate@444, ResolutionCandidate@445 }
+    <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]
+    <name not found> = EmptyList@20[empty]
+    <name not found> = EmptyList@20[empty]
+    <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/Jet81.lazy.log b/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
index 58085a2891c..dff7dd66e26 100644
--- a/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/Jet81.lazy.log
@@ -43,26 +43,129 @@ LazyJavaPackageFragmentProvider@15 {
 LazyJavaPackageFragment@17['<root>'] {
     classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('b': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('y': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('y': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@24['lang'] {
-    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('b': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('plus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('y': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('plus': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('a': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('b': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('y': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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> = 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 }
+    <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]
+}
+
+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]
+    <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> = 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@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@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]
+}
+
+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 516b1dcbd04..e21e970bfa4 100644
--- a/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/OutProjections.lazy.log
@@ -55,3 +55,67 @@ LazyJavaPackageFragment@10['lang'] {
     functions('fout': 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@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]
+    <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]
+    <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]
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log b/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
index 4e08690ead8..8123e6e1437 100644
--- a/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/OverrideResolution.lazy.log
@@ -16,23 +16,34 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@18) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
-}
-
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('foo': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
index d2869d20a17..7bcbc963550 100644
--- a/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/SpecififcityByReceiver.lazy.log
@@ -28,22 +28,31 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Array': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('Boolean': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
index 7679db6e745..301404235d5 100644
--- a/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/TypeMismatchOnUnaryOperations.lazy.log
@@ -20,38 +20,81 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Array': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('dec': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('inc': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('not': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('dec': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('inc': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('minus': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('not': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    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
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('dec': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('inc': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('minus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('not': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@28 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('dec': Name@23) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('inc': Name@24) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('minus': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('not': Name@26) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('plus': Name@27) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@35
+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@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@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 }
+}
+
+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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
index 398ae31fa33..3e08e36637f 100644
--- a/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/UnavaliableQualifiedThis.lazy.log
@@ -25,30 +25,44 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('Boolean': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('next': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('transform': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('next': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('transform': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('transform': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('transform': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@10['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@30) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('lang': Name@32) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@31
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('invoke': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('transform': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('next': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('transform': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('transform': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('transform': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
index 8fb061ebd7d..bf2685845ba 100644
--- a/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/WrongTraceInCallResolver.lazy.log
@@ -45,3 +45,12 @@ LazyJavaPackageFragment@11['lang'] {
     functions('foo': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log b/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
index d40366f0073..465a630e950 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/ea40964.lazy.log
@@ -68,21 +68,21 @@ LazyJavaClassifierType@58['K'] {
     arguments = ArrayList@59[empty]
     classifier = JavaTypeParameterImpl@60['K']
     nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
 }
 
-LazyJavaClassifierType@61['K'] {
-    arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@63['K']
+LazyJavaClassifierType@62['K'] {
+    arguments = ArrayList@63[empty]
+    classifier = JavaTypeParameterImpl@64['K']
     nullable = 'false': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
-LazyJavaClassifierType@64['K'] {
-    arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+LazyJavaClassifierType@65['K'] {
+    arguments = ArrayList@66[empty]
+    classifier = JavaTypeParameterImpl@67['K']
     nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@68['K'] {
@@ -96,35 +96,35 @@ LazyJavaClassifierType@71['K'] {
     arguments = ArrayList@72[empty]
     classifier = JavaTypeParameterImpl@60['K']
     nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
 }
 
 LazyJavaClassifierType@74['K'] {
     arguments = ArrayList@75[empty]
-    classifier = JavaTypeParameterImpl@70['K']
+    classifier = JavaTypeParameterImpl@64['K']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@76['K'] {
     arguments = ArrayList@77[empty]
-    classifier = JavaTypeParameterImpl@63['K']
+    classifier = JavaTypeParameterImpl@55['K']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@78['K'] {
     arguments = ArrayList@79[empty]
-    classifier = JavaTypeParameterImpl@55['K']
+    classifier = JavaTypeParameterImpl@67['K']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@80['K'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@66['K']
+    classifier = JavaTypeParameterImpl@70['K']
     nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
 }
 
 LazyJavaClassifierType@82['Map<? extends K, ? extends V>'] {
@@ -143,14 +143,14 @@ LazyJavaClassifierType@89['Map<? extends K, ? extends V>'] {
     typeConstructor = DeserializedClassTypeConstructor@94
 }
 
-LazyJavaClassifierType@39['Map<K, V>'] {
+LazyJavaClassifierType@33['Map<K, V>'] {
     arguments = ArrayList@95[2] { TypeProjectionImpl@96, TypeProjectionImpl@97 }
     classifier = JavaClassImpl@98['Map']
     memberScope = SubstitutingScope@99
     typeConstructor = DeserializedClassTypeConstructor@88
 }
 
-LazyJavaClassifierType@33['Map<K, V>'] {
+LazyJavaClassifierType@39['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@112['Object']
+    classifier = JavaClassImpl@107['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@107['Object']
+    classifier = JavaClassImpl@112['Object']
     memberScope = DeserializedClassMemberScope@108
     nullable = 'true': Boolean@73
     typeConstructor = DeserializedClassTypeConstructor@109
@@ -231,7 +231,7 @@ LazyJavaClassifierType@135['V'] {
     arguments = ArrayList@136[empty]
     classifier = JavaTypeParameterImpl@137['V']
     nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
 
 LazyJavaClassifierType@138['V'] {
@@ -245,7 +245,7 @@ LazyJavaClassifierType@141['V'] {
     arguments = ArrayList@142[empty]
     classifier = JavaTypeParameterImpl@143['V']
     nullable = 'false': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@144['V'] {
@@ -257,7 +257,7 @@ LazyJavaClassifierType@144['V'] {
 
 LazyJavaClassifierType@147['V'] {
     arguments = ArrayList@148[empty]
-    classifier = JavaTypeParameterImpl@146['V']
+    classifier = JavaTypeParameterImpl@134['V']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -266,7 +266,7 @@ LazyJavaClassifierType@149['V'] {
     arguments = ArrayList@150[empty]
     classifier = JavaTypeParameterImpl@143['V']
     nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@151['V'] {
@@ -278,28 +278,28 @@ LazyJavaClassifierType@151['V'] {
 
 LazyJavaClassifierType@153['V'] {
     arguments = ArrayList@154[empty]
-    classifier = JavaTypeParameterImpl@140['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
-}
-
-LazyJavaClassifierType@155['V'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaTypeParameterImpl@137['V']
-    nullable = 'true': Boolean@73
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-}
-
-LazyJavaClassifierType@157['V'] {
-    arguments = ArrayList@158[empty]
     classifier = JavaTypeParameterImpl@130['V']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
+LazyJavaClassifierType@155['V'] {
+    arguments = ArrayList@156[empty]
+    classifier = JavaTypeParameterImpl@140['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+}
+
+LazyJavaClassifierType@157['V'] {
+    arguments = ArrayList@158[empty]
+    classifier = JavaTypeParameterImpl@146['V']
+    nullable = 'true': Boolean@73
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+}
+
 LazyJavaClassifierType@159['V'] {
     arguments = ArrayList@160[empty]
-    classifier = JavaTypeParameterImpl@134['V']
+    classifier = JavaTypeParameterImpl@137['V']
     nullable = 'true': Boolean@73
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
 }
@@ -361,18 +361,18 @@ LazyJavaTypeParameterDescriptor@35['K'] {
 
 LazyJavaTypeParameterDescriptor@30['K'] {
     defaultType = JetTypeImpl@203['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@67
-}
-
-LazyJavaTypeParameterDescriptor@31['V'] {
-    defaultType = JetTypeImpl@204['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-    upperBounds = LinkedHashSet@205[1] { NullableType@206 }
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
 }
 
 LazyJavaTypeParameterDescriptor@36['V'] {
-    defaultType = JetTypeImpl@207['V']
+    defaultType = JetTypeImpl@204['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@127
+    upperBounds = LinkedHashSet@205[1] { NullableType@206 }
+}
+
+LazyJavaTypeParameterDescriptor@31['V'] {
+    defaultType = JetTypeImpl@207['V']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
     upperBounds = LinkedHashSet@208[1] { NullableType@209 }
 }
 
@@ -387,9 +387,56 @@ LazyJavaTypeParameterResolver@213 {
 }
 
 LazyJavaTypeParameterResolver@216 {
-    resolve(JavaTypeParameterImpl@126['V']) = null
+    resolve(JavaTypeParameterImpl@143['V']) = null
 }
 
 LazyJavaTypeParameterResolver@217 {
-    resolve(JavaTypeParameterImpl@130['V']) = null
+    resolve(JavaTypeParameterImpl@140['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]
+    <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]
+    <name not found> = EmptyList@8[empty]
+    <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@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@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 955999c2475..bdd0c780952 100644
--- a/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/ea53340.lazy.log
@@ -26,25 +26,35 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Function0': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@24
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('A': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('invoke': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('A': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    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
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('A': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('invoke': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('A': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('A': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
index 9e99446bb57..8b92b4945af 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt127.lazy.log
@@ -46,3 +46,17 @@ LazyJavaPackageFragment@11['lang'] {
     functions('equals': Name@30) = 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@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> = EmptyList@32[empty]
+}
+
+ResolutionTaskHolder@48 {
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@50 }
+    <name not found> = ArrayList@51[1] { ResolutionCandidate@50 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
index f0aec9728cf..04f0b5ee0f5 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt128.lazy.log
@@ -35,3 +35,21 @@ LazyJavaPackageFragment@8['lang'] {
     functions('div': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+    <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 a83b2207669..3ddcc60a41d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1489_1728.lazy.log
@@ -89,14 +89,14 @@ LazyJavaClassifierType@44['Throwable'] {
 
 LazyJavaClassifierType@47['Throwable'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@46['Throwable']
+    classifier = JavaClassImpl@42['Throwable']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@43
 }
 
 LazyJavaClassifierType@49['Throwable'] {
     arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@42['Throwable']
+    classifier = JavaClassImpl@46['Throwable']
     nullable = 'true': Boolean@37
     typeConstructor = DeserializedClassTypeConstructor@43
 }
@@ -154,13 +154,148 @@ LazyJavaPackageFragment@64['lang'] {
     classes('UnsupportedOperationException': Name@94) = LazyJavaClassDescriptor@6['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@95
     classes('ext': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@95
     classes('foo': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('invoke': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('p': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('p': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@95
     deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@95
     functions('UnsupportedOperationException': Name@94) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
     functions('ext': Name@96) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
     functions('foo': Name@97) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('invoke': Name@98) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('p': Name@99) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@95
+    functions('p': Name@98) = EmptyList@92[empty] // through LazyPackageFragmentScopeForJavaPackage@95
+    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@95
+}
+
+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> = 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]
+    <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@107 {
+    <name not found> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@109 }
+    <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@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]
+    <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@125 {
+    <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 4e5568b9b74..3307f19df4c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1550.lazy.log
@@ -3,102 +3,86 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     functions('add': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['add'] } // through LazyJavaClassMemberScope@5
     functions('get': Name@6) = EmptyList@7[empty] // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@5
-    properties('add': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@5
-    properties('get': Name@10) = EmptyList@7[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@9['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@13['AbstractList'] {
-    defaultType = JetTypeImpl@14['AbstractList<1>']
-    functions('add': Name@15) = ArrayList@16[2] { JavaMethodDescriptor@17['add'], JavaMethodDescriptor@18['add'] } // through LazyJavaClassMemberScope@19
-    functions('get': Name@20) = ArrayList@21[1] { JavaMethodDescriptor@22['get'] } // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@19
-    properties('add': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@19
-    properties('get': Name@10) = EmptyList@7[empty] // through LazyJavaClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@25['AbstractList']
+LazyJavaClassDescriptor@11['AbstractList'] {
+    defaultType = JetTypeImpl@12['AbstractList<1>']
+    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
+    functions('get': Name@18) = ArrayList@19[1] { JavaMethodDescriptor@20['get'] } // through LazyJavaClassMemberScope@17
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@17
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
 }
 
-LazyJavaClassDescriptor@26['Appendable'] {
-    functions('println': Name@27) = EmptyList@7[empty] // through LazyJavaClassMemberScope@28
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@28
-    properties('println': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@28
-    typeConstructor = LazyJavaClassTypeConstructor@31['Appendable']
+LazyJavaClassDescriptor@24['Appendable'] {
+    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@26
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['Appendable']
 }
 
-LazyJavaClassDescriptor@32['ArrayList'] {
-    constructors = ArrayList@33[3] { JavaConstructorDescriptor@34['<init>'], JavaConstructorDescriptor@35['<init>'], JavaConstructorDescriptor@36['<init>'] } // through LazyJavaClassMemberScope@37
-    defaultType = JetTypeImpl@38['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@39 // through LazyJavaClassMemberScope@37
+LazyJavaClassDescriptor@29['ArrayList'] {
+    constructors = ArrayList@30[3] { JavaConstructorDescriptor@31['<init>'], JavaConstructorDescriptor@32['<init>'], JavaConstructorDescriptor@33['<init>'] } // through LazyJavaClassMemberScope@34
+    defaultType = JetTypeImpl@35['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@34
     functionTypeForSamInterface = null
-    functions('add': Name@9) = ArrayList@40[2] { JavaMethodDescriptor@41['add'], JavaMethodDescriptor@42['add'] } // through LazyJavaClassMemberScope@37
-    functions('get': Name@10) = ArrayList@43[1] { JavaMethodDescriptor@44['get'] } // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@37
-    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@37
-    nestedClasses('add': Name@9) = null // through LazyJavaClassMemberScope@37
-    nestedClasses('get': Name@10) = null // through LazyJavaClassMemberScope@37
-    properties('add': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@37
-    properties('get': Name@10) = EmptyList@7[empty] // through LazyJavaClassMemberScope@37
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@47['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@48['ArrayList']
+    functions('add': Name@37) = ArrayList@38[2] { JavaMethodDescriptor@39['add'], JavaMethodDescriptor@40['add'] } // through LazyJavaClassMemberScope@34
+    functions('get': Name@41) = ArrayList@42[1] { JavaMethodDescriptor@43['get'] } // through LazyJavaClassMemberScope@34
+    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@34
+    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@34
+    nestedClasses('add': Name@37) = null // through LazyJavaClassMemberScope@34
+    nestedClasses('get': Name@41) = null // through LazyJavaClassMemberScope@34
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@47['ArrayList']
 }
 
-LazyJavaClassDescriptor@49['AutoCloseable'] {
-    functions('println': Name@27) = EmptyList@7[empty] // through LazyJavaClassMemberScope@50
-    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
-    properties('println': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['AutoCloseable']
+LazyJavaClassDescriptor@48['AutoCloseable'] {
+    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@49
+    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@49
+    typeConstructor = LazyJavaClassTypeConstructor@51['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@53['Closeable'] {
-    functions('println': Name@27) = EmptyList@7[empty] // through LazyJavaClassMemberScope@54
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
-    properties('println': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['Closeable']
+LazyJavaClassDescriptor@52['Closeable'] {
+    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@53
+    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
+    typeConstructor = LazyJavaClassTypeConstructor@55['Closeable']
 }
 
-LazyJavaClassDescriptor@57['FilterOutputStream'] {
-    functions('println': Name@27) = EmptyList@7[empty] // through LazyJavaClassMemberScope@58
-    memberIndex = computeMemberIndex$1@59 // through LazyJavaClassMemberScope@58
-    properties('println': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@58
-    typeConstructor = LazyJavaClassTypeConstructor@60['FilterOutputStream']
+LazyJavaClassDescriptor@56['FilterOutputStream'] {
+    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@57
+    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@57
+    typeConstructor = LazyJavaClassTypeConstructor@59['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@61['OutputStream'] {
-    functions('println': Name@27) = EmptyList@7[empty] // through LazyJavaClassMemberScope@62
-    memberIndex = computeMemberIndex$1@63 // through LazyJavaClassMemberScope@62
-    properties('println': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@64['OutputStream']
+LazyJavaClassDescriptor@60['OutputStream'] {
+    functions('println': Name@25) = EmptyList@7[empty] // through LazyJavaClassMemberScope@61
+    memberIndex = computeMemberIndex$1@62 // through LazyJavaClassMemberScope@61
+    typeConstructor = LazyJavaClassTypeConstructor@63['OutputStream']
 }
 
-LazyJavaClassDescriptor@65['PrintStream'] {
-    defaultType = JetTypeImpl@66['PrintStream']
-    enumEntryIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@68
-    functions('println': Name@30) = ArrayList@69[10] { JavaMethodDescriptor@70['println'], JavaMethodDescriptor@71['println'], JavaMethodDescriptor@72['println'], ... } // through LazyJavaClassMemberScope@68
-    memberIndex = computeMemberIndex$1@73 // through LazyJavaClassMemberScope@68
-    nestedClassIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@68
-    nestedClasses('println': Name@30) = null // through LazyJavaClassMemberScope@68
-    properties('println': Name@30) = EmptyList@7[empty] // through LazyJavaClassMemberScope@68
+LazyJavaClassDescriptor@64['PrintStream'] {
+    defaultType = JetTypeImpl@65['PrintStream']
+    enumEntryIndex = LinkedHashMap@66 // through LazyJavaClassMemberScope@67
+    functions('println': Name@68) = ArrayList@69[10] { JavaMethodDescriptor@70['println'], JavaMethodDescriptor@71['println'], JavaMethodDescriptor@72['println'], ... } // through LazyJavaClassMemberScope@67
+    memberIndex = computeMemberIndex$1@73 // through LazyJavaClassMemberScope@67
+    nestedClassIndex = LinkedHashMap@74 // through LazyJavaClassMemberScope@67
+    nestedClasses('println': Name@68) = null // through LazyJavaClassMemberScope@67
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@75['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@76['PrintStream']
 }
 
 LazyJavaClassDescriptor@77['RandomAccess'] {
-    functions('add': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
-    functions('get': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
+    functions('add': Name@13) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
+    functions('get': Name@18) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
     memberIndex = computeMemberIndex$1@79 // through LazyJavaClassMemberScope@78
-    properties('add': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
-    properties('get': Name@10) = EmptyList@7[empty] // through LazyJavaClassMemberScope@78
     typeConstructor = LazyJavaClassTypeConstructor@80['RandomAccess']
 }
 
 LazyJavaClassDescriptor@81['Serializable'] {
-    functions('add': Name@15) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
-    functions('get': Name@20) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
+    functions('add': Name@13) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
+    functions('get': Name@18) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
     memberIndex = computeMemberIndex$1@83 // through LazyJavaClassMemberScope@82
-    properties('add': Name@9) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
-    properties('get': Name@10) = EmptyList@7[empty] // through LazyJavaClassMemberScope@82
     typeConstructor = LazyJavaClassTypeConstructor@84['Serializable']
 }
 
@@ -113,42 +97,42 @@ LazyJavaClassDescriptor@85['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@95['System']
 }
 
-LazyJavaClassTypeConstructor@12['AbstractCollection'] {
+LazyJavaClassTypeConstructor@10['AbstractCollection'] {
     parameters = ArrayList@96[1] { LazyJavaTypeParameterDescriptor@97['E'] }
     supertypes = ArrayList@98[1] { LazyJavaClassifierType@99['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@25['AbstractList'] {
+LazyJavaClassTypeConstructor@23['AbstractList'] {
     parameters = ArrayList@100[1] { LazyJavaTypeParameterDescriptor@101['E'] }
     supertypes = ArrayList@102[2] { LazyJavaClassifierType@103['AbstractCollection<E>'], LazyJavaClassifierType@104['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@31['Appendable'] {
+LazyJavaClassTypeConstructor@28['Appendable'] {
     parameters = ArrayList@105[empty]
     supertypes = ArrayList@106[1] { JetTypeImpl@107['Any'] }
 }
 
-LazyJavaClassTypeConstructor@48['ArrayList'] {
+LazyJavaClassTypeConstructor@47['ArrayList'] {
     parameters = ArrayList@108[1] { LazyJavaTypeParameterDescriptor@109['E'] }
     supertypes = ArrayList@110[5] { LazyJavaClassifierType@111['AbstractList<E>'], LazyJavaClassifierType@112['List<E>'], LazyJavaClassifierType@113['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@52['AutoCloseable'] {
+LazyJavaClassTypeConstructor@51['AutoCloseable'] {
     parameters = ArrayList@114[empty]
     supertypes = ArrayList@115[1] { JetTypeImpl@107['Any'] }
 }
 
-LazyJavaClassTypeConstructor@56['Closeable'] {
+LazyJavaClassTypeConstructor@55['Closeable'] {
     parameters = ArrayList@116[empty]
     supertypes = ArrayList@117[1] { LazyJavaClassifierType@118['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@60['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@59['FilterOutputStream'] {
     parameters = ArrayList@119[empty]
     supertypes = ArrayList@120[1] { LazyJavaClassifierType@121['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@64['OutputStream'] {
+LazyJavaClassTypeConstructor@63['OutputStream'] {
     parameters = ArrayList@122[empty]
     supertypes = ArrayList@123[1] { LazyJavaClassifierType@124['Closeable'] }
 }
@@ -176,28 +160,28 @@ LazyJavaClassifierType@103['AbstractCollection<E>'] {
     arguments = ArrayList@135[1] { TypeProjectionImpl@136 }
     classifier = JavaClassImpl@137['AbstractCollection']
     memberScope = SubstitutingScope@138
-    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
 }
 
 LazyJavaClassifierType@111['AbstractList<E>'] {
     arguments = ArrayList@139[1] { TypeProjectionImpl@140 }
     classifier = JavaClassImpl@141['AbstractList']
     memberScope = SubstitutingScope@142
-    typeConstructor = LazyJavaClassTypeConstructor@25['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
 }
 
 LazyJavaClassifierType@128['Appendable'] {
     arguments = ArrayList@143[empty]
     classifier = JavaClassImpl@144['Appendable']
-    memberScope = LazyJavaClassMemberScope@28
-    typeConstructor = LazyJavaClassTypeConstructor@31['Appendable']
+    memberScope = LazyJavaClassMemberScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@28['Appendable']
 }
 
 LazyJavaClassifierType@118['AutoCloseable'] {
     arguments = ArrayList@145[empty]
     classifier = JavaClassImpl@146['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@50
-    typeConstructor = LazyJavaClassTypeConstructor@52['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@49
+    typeConstructor = LazyJavaClassTypeConstructor@51['AutoCloseable']
 }
 
 LazyJavaClassifierType@147['Cloneable'] {
@@ -210,15 +194,15 @@ LazyJavaClassifierType@147['Cloneable'] {
 LazyJavaClassifierType@124['Closeable'] {
     arguments = ArrayList@152[empty]
     classifier = JavaClassImpl@153['Closeable']
-    memberScope = LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['Closeable']
+    memberScope = LazyJavaClassMemberScope@53
+    typeConstructor = LazyJavaClassTypeConstructor@55['Closeable']
 }
 
 LazyJavaClassifierType@129['Closeable'] {
     arguments = ArrayList@154[empty]
     classifier = JavaClassImpl@155['Closeable']
-    memberScope = LazyJavaClassMemberScope@54
-    typeConstructor = LazyJavaClassTypeConstructor@56['Closeable']
+    memberScope = LazyJavaClassMemberScope@53
+    typeConstructor = LazyJavaClassTypeConstructor@55['Closeable']
 }
 
 LazyJavaClassifierType@156['Collection<? extends E>'] {
@@ -262,21 +246,21 @@ LazyJavaClassifierType@181['E'] {
     arguments = ArrayList@182[empty]
     classifier = JavaTypeParameterImpl@183['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@184['E'] {
     arguments = ArrayList@185[empty]
     classifier = JavaTypeParameterImpl@186['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@187
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
-LazyJavaClassifierType@188['E'] {
-    arguments = ArrayList@189[empty]
-    classifier = JavaTypeParameterImpl@190['E']
+LazyJavaClassifierType@187['E'] {
+    arguments = ArrayList@188[empty]
+    classifier = JavaTypeParameterImpl@189['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
 }
 
 LazyJavaClassifierType@191['E'] {
@@ -297,68 +281,68 @@ LazyJavaClassifierType@197['E'] {
     arguments = ArrayList@198[empty]
     classifier = JavaTypeParameterImpl@199['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
 
 LazyJavaClassifierType@200['E'] {
     arguments = ArrayList@201[empty]
     classifier = JavaTypeParameterImpl@202['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
 
 LazyJavaClassifierType@203['E'] {
     arguments = ArrayList@204[empty]
     classifier = JavaTypeParameterImpl@205['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@187
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
 
 LazyJavaClassifierType@206['E'] {
     arguments = ArrayList@207[empty]
     classifier = JavaTypeParameterImpl@208['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@209['E'] {
     arguments = ArrayList@210[empty]
     classifier = JavaTypeParameterImpl@211['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
 }
 
 LazyJavaClassifierType@212['E'] {
     arguments = ArrayList@213[empty]
     classifier = JavaTypeParameterImpl@214['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@215['E'] {
     arguments = ArrayList@216[empty]
     classifier = JavaTypeParameterImpl@217['E']
     nullable = 'false': Boolean@161
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
 
 LazyJavaClassifierType@218['E'] {
     arguments = ArrayList@219[empty]
-    classifier = JavaTypeParameterImpl@208['E']
-    nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
-}
-
-LazyJavaClassifierType@220['E'] {
-    arguments = ArrayList@221[empty]
-    classifier = JavaTypeParameterImpl@217['E']
+    classifier = JavaTypeParameterImpl@193['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
+LazyJavaClassifierType@220['E'] {
+    arguments = ArrayList@221[empty]
+    classifier = JavaTypeParameterImpl@205['E']
+    nullable = 'true': Boolean@167
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+}
+
 LazyJavaClassifierType@222['E'] {
     arguments = ArrayList@223[empty]
-    classifier = JavaTypeParameterImpl@175['E']
+    classifier = JavaTypeParameterImpl@214['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
@@ -367,75 +351,75 @@ LazyJavaClassifierType@224['E'] {
     arguments = ArrayList@225[empty]
     classifier = JavaTypeParameterImpl@211['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
 }
 
 LazyJavaClassifierType@226['E'] {
     arguments = ArrayList@227[empty]
-    classifier = JavaTypeParameterImpl@196['E']
+    classifier = JavaTypeParameterImpl@179['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
 
 LazyJavaClassifierType@228['E'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@202['E']
+    classifier = JavaTypeParameterImpl@183['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@230['E'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@205['E']
+    classifier = JavaTypeParameterImpl@189['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@187
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
 }
 
 LazyJavaClassifierType@232['E'] {
     arguments = ArrayList@233[empty]
-    classifier = JavaTypeParameterImpl@193['E']
+    classifier = JavaTypeParameterImpl@202['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
 
 LazyJavaClassifierType@234['E'] {
     arguments = ArrayList@235[empty]
-    classifier = JavaTypeParameterImpl@186['E']
+    classifier = JavaTypeParameterImpl@196['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@187
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@236['E'] {
     arguments = ArrayList@237[empty]
-    classifier = JavaTypeParameterImpl@214['E']
+    classifier = JavaTypeParameterImpl@208['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@238['E'] {
     arguments = ArrayList@239[empty]
-    classifier = JavaTypeParameterImpl@190['E']
+    classifier = JavaTypeParameterImpl@175['E']
     nullable = 'true': Boolean@167
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@240['E'] {
     arguments = ArrayList@241[empty]
-    classifier = JavaTypeParameterImpl@199['E']
+    classifier = JavaTypeParameterImpl@186['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
 }
 
 LazyJavaClassifierType@242['E'] {
     arguments = ArrayList@243[empty]
-    classifier = JavaTypeParameterImpl@183['E']
+    classifier = JavaTypeParameterImpl@217['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
 
 LazyJavaClassifierType@244['E'] {
     arguments = ArrayList@245[empty]
-    classifier = JavaTypeParameterImpl@179['E']
+    classifier = JavaTypeParameterImpl@199['E']
     nullable = 'true': Boolean@167
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
 }
@@ -443,8 +427,8 @@ LazyJavaClassifierType@244['E'] {
 LazyJavaClassifierType@127['FilterOutputStream'] {
     arguments = ArrayList@246[empty]
     classifier = JavaClassImpl@247['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@58
-    typeConstructor = LazyJavaClassTypeConstructor@60['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@57
+    typeConstructor = LazyJavaClassTypeConstructor@59['FilterOutputStream']
 }
 
 LazyJavaClassifierType@248['Flushable'] {
@@ -518,14 +502,14 @@ LazyJavaClassifierType@277['Object'] {
 LazyJavaClassifierType@121['OutputStream'] {
     arguments = ArrayList@279[empty]
     classifier = JavaClassImpl@280['OutputStream']
-    memberScope = LazyJavaClassMemberScope@62
-    typeConstructor = LazyJavaClassTypeConstructor@64['OutputStream']
+    memberScope = LazyJavaClassMemberScope@61
+    typeConstructor = LazyJavaClassTypeConstructor@63['OutputStream']
 }
 
 LazyJavaClassifierType@281['PrintStream'] {
     arguments = ArrayList@282[empty]
     classifier = JavaClassImpl@283['PrintStream']
-    memberScope = LazyJavaClassMemberScope@68
+    memberScope = LazyJavaClassMemberScope@67
     nullable = 'false': Boolean@161
     typeConstructor = LazyJavaClassTypeConstructor@76['PrintStream']
 }
@@ -596,14 +580,14 @@ LazyJavaPackageFragmentProvider@297 {
     packageFragments('kotlin.io': FqName@330) = null
     packageFragments('kotlin.jvm': FqName@331) = null
     topLevelClasses(JavaClassImpl@137['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@141['AbstractList']) = LazyJavaClassDescriptor@13['AbstractList']
-    topLevelClasses(JavaClassImpl@144['Appendable']) = LazyJavaClassDescriptor@26['Appendable']
-    topLevelClasses(JavaClassImpl@332['ArrayList']) = LazyJavaClassDescriptor@32['ArrayList']
-    topLevelClasses(JavaClassImpl@146['AutoCloseable']) = LazyJavaClassDescriptor@49['AutoCloseable']
-    topLevelClasses(JavaClassImpl@155['Closeable']) = LazyJavaClassDescriptor@53['Closeable']
-    topLevelClasses(JavaClassImpl@247['FilterOutputStream']) = LazyJavaClassDescriptor@57['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@280['OutputStream']) = LazyJavaClassDescriptor@61['OutputStream']
-    topLevelClasses(JavaClassImpl@283['PrintStream']) = LazyJavaClassDescriptor@65['PrintStream']
+    topLevelClasses(JavaClassImpl@141['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
+    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@247['FilterOutputStream']) = LazyJavaClassDescriptor@56['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@280['OutputStream']) = LazyJavaClassDescriptor@60['OutputStream']
+    topLevelClasses(JavaClassImpl@283['PrintStream']) = LazyJavaClassDescriptor@64['PrintStream']
     topLevelClasses(JavaClassImpl@287['RandomAccess']) = LazyJavaClassDescriptor@77['RandomAccess']
     topLevelClasses(JavaClassImpl@290['Serializable']) = LazyJavaClassDescriptor@81['Serializable']
     topLevelClasses(JavaClassImpl@333['System']) = LazyJavaClassDescriptor@85['System']
@@ -621,44 +605,27 @@ LazyJavaPackageFragment@310['java'] {
 LazyJavaPackageFragment@314['lang'] {
     classes('ArrayList': Name@341) = null // through LazyPackageFragmentScopeForJavaPackage@342
     classes('System': Name@343) = LazyJavaClassDescriptor@85['System'] // through LazyPackageFragmentScopeForJavaPackage@342
-    classes('add': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@342
-    classes('dec': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@342
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@342
-    classes('inc': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@342
-    classes('minus': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@342
-    classes('println': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@342
     deserializedPackageScope = Empty@337 // through LazyPackageFragmentScopeForJavaPackage@342
     functions('ArrayList': Name@341) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    functions('add': Name@9) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    functions('dec': Name@344) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    functions('get': Name@10) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    functions('inc': Name@345) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    functions('minus': Name@346) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    functions('println': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@342
-    memberIndex = computeMemberIndex$1@347 // through LazyPackageFragmentScopeForJavaPackage@342
+    memberIndex = computeMemberIndex$1@344 // through LazyPackageFragmentScopeForJavaPackage@342
 }
 
 LazyJavaPackageFragment@320['util'] {
-    classes('Array': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('ArrayList': Name@341) = LazyJavaClassDescriptor@32['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('Int': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('String': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('System': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('add': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('dec': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('inc': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('minus': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    classes('println': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@349
-    deserializedPackageScope = Empty@337 // through LazyPackageFragmentScopeForJavaPackage@349
-    functions('ArrayList': Name@341) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@349
-    functions('add': Name@9) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@349
-    functions('dec': Name@344) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@349
-    functions('get': Name@10) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@349
-    functions('inc': Name@345) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@349
-    functions('minus': Name@346) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@349
-    functions('println': Name@30) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@349
-    memberIndex = computeMemberIndex$1@352 // through LazyPackageFragmentScopeForJavaPackage@349
+    classes('Array': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@346
+    classes('ArrayList': Name@341) = LazyJavaClassDescriptor@29['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@346
+    classes('Int': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@346
+    classes('String': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@346
+    classes('System': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@346
+    deserializedPackageScope = Empty@337 // through LazyPackageFragmentScopeForJavaPackage@346
+    functions('ArrayList': Name@341) = EmptyList@7[empty] // through LazyPackageFragmentScopeForJavaPackage@346
+    memberIndex = computeMemberIndex$1@349 // through LazyPackageFragmentScopeForJavaPackage@346
+}
+
+LazyJavaTypeParameterDescriptor@97['E'] {
+    defaultType = JetTypeImpl@350['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@190
+    upperBounds = LinkedHashSet@351[1] { NullableType@352 }
+    upperBoundsAsType = NullableType@352
 }
 
 LazyJavaTypeParameterDescriptor@101['E'] {
@@ -675,23 +642,28 @@ LazyJavaTypeParameterDescriptor@109['E'] {
     upperBoundsAsType = NullableType@358
 }
 
-LazyJavaTypeParameterDescriptor@97['E'] {
-    defaultType = JetTypeImpl@359['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@187
-    upperBounds = LinkedHashSet@360[1] { NullableType@361 }
-    upperBoundsAsType = NullableType@361
+LazyJavaTypeParameterResolver@359 {
+    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@97['E']
 }
 
-LazyJavaTypeParameterResolver@362 {
-    resolve(JavaTypeParameterImpl@363['E']) = LazyJavaTypeParameterDescriptor@101['E']
+LazyJavaTypeParameterResolver@361 {
+    resolve(JavaTypeParameterImpl@362['E']) = LazyJavaTypeParameterDescriptor@101['E']
 }
 
-LazyJavaTypeParameterResolver@364 {
-    resolve(JavaTypeParameterImpl@365['E']) = LazyJavaTypeParameterDescriptor@97['E']
+LazyJavaTypeParameterResolver@363 {
+    resolve(JavaTypeParameterImpl@364['E']) = LazyJavaTypeParameterDescriptor@109['E']
+}
+
+LazyJavaTypeParameterResolver@365 {
+    resolve(JavaTypeParameterImpl@208['E']) = null
 }
 
 LazyJavaTypeParameterResolver@366 {
-    resolve(JavaTypeParameterImpl@367['E']) = LazyJavaTypeParameterDescriptor@109['E']
+    resolve(JavaTypeParameterImpl@175['E']) = null
+}
+
+LazyJavaTypeParameterResolver@367 {
+    resolve(JavaTypeParameterImpl@202['E']) = null
 }
 
 LazyJavaTypeParameterResolver@368 {
@@ -699,25 +671,152 @@ LazyJavaTypeParameterResolver@368 {
 }
 
 LazyJavaTypeParameterResolver@369 {
-    resolve(JavaTypeParameterImpl@211['E']) = null
-}
-
-LazyJavaTypeParameterResolver@370 {
-    resolve(JavaTypeParameterImpl@214['E']) = null
-}
-
-LazyJavaTypeParameterResolver@371 {
-    resolve(JavaTypeParameterImpl@217['E']) = null
-}
-
-LazyJavaTypeParameterResolver@372 {
-    resolve(JavaTypeParameterImpl@175['E']) = null
-}
-
-LazyJavaTypeParameterResolver@373 {
     resolve(JavaTypeParameterImpl@179['E']) = null
 }
 
-LazyJavaTypeParameterResolver@374 {
-    resolve(JavaTypeParameterImpl@208['E']) = null
+LazyJavaTypeParameterResolver@370 {
+    resolve(JavaTypeParameterImpl@211['E']) = null
+}
+
+LazyJavaTypeParameterResolver@371 {
+    resolve(JavaTypeParameterImpl@183['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@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@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]
+    <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@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[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]
+    <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@455 {
+    <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@456 {
+    <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@457 {
+    <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/regressions/kt1639-JFrame.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
index 6e584f13392..28cc4e6904a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1639-JFrame.lazy.log
@@ -4047,7 +4047,7 @@ LazyJavaClassifierType@6643['AWTKeyStroke'] {
 
 LazyJavaClassifierType@6646['AWTKeyStroke'] {
     arguments = ArrayList@6647[empty]
-    classifier = JavaClassImpl@6627['AWTKeyStroke']
+    classifier = JavaClassImpl@6639['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
@@ -4061,70 +4061,70 @@ LazyJavaClassifierType@6648['AWTKeyStroke'] {
 
 LazyJavaClassifierType@6650['AWTKeyStroke'] {
     arguments = ArrayList@6651[empty]
-    classifier = JavaClassImpl@6639['AWTKeyStroke']
+    classifier = JavaClassImpl@6627['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6652['AWTKeyStroke'] {
     arguments = ArrayList@6653[empty]
-    classifier = JavaClassImpl@6645['AWTKeyStroke']
+    classifier = JavaClassImpl@6630['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6654['AWTKeyStroke'] {
     arguments = ArrayList@6655[empty]
-    classifier = JavaClassImpl@6633['AWTKeyStroke']
+    classifier = JavaClassImpl@6621['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6656['AWTKeyStroke'] {
     arguments = ArrayList@6657[empty]
-    classifier = JavaClassImpl@6630['AWTKeyStroke']
+    classifier = JavaClassImpl@6618['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6658['AWTKeyStroke'] {
     arguments = ArrayList@6659[empty]
-    classifier = JavaClassImpl@6618['AWTKeyStroke']
+    classifier = JavaClassImpl@6636['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6660['AWTKeyStroke'] {
     arguments = ArrayList@6661[empty]
-    classifier = JavaClassImpl@6615['AWTKeyStroke']
+    classifier = JavaClassImpl@6642['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6662['AWTKeyStroke'] {
     arguments = ArrayList@6663[empty]
-    classifier = JavaClassImpl@6636['AWTKeyStroke']
+    classifier = JavaClassImpl@6645['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6664['AWTKeyStroke'] {
     arguments = ArrayList@6665[empty]
-    classifier = JavaClassImpl@6642['AWTKeyStroke']
+    classifier = JavaClassImpl@6633['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6666['AWTKeyStroke'] {
     arguments = ArrayList@6667[empty]
-    classifier = JavaClassImpl@6624['AWTKeyStroke']
+    classifier = JavaClassImpl@6615['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
 
 LazyJavaClassifierType@6668['AWTKeyStroke'] {
     arguments = ArrayList@6669[empty]
-    classifier = JavaClassImpl@6621['AWTKeyStroke']
+    classifier = JavaClassImpl@6624['AWTKeyStroke']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1['AWTKeyStroke']
 }
@@ -5016,210 +5016,210 @@ LazyJavaClassifierType@7011['Component'] {
 
 LazyJavaClassifierType@7014['Component'] {
     arguments = ArrayList@7015[empty]
-    classifier = JavaClassImpl@6953['Component']
+    classifier = JavaClassImpl@6830['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7016['Component'] {
     arguments = ArrayList@7017[empty]
-    classifier = JavaClassImpl@6935['Component']
+    classifier = JavaClassImpl@6947['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7018['Component'] {
     arguments = ArrayList@7019[empty]
-    classifier = JavaClassImpl@6878['Component']
+    classifier = JavaClassImpl@6962['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7020['Component'] {
     arguments = ArrayList@7021[empty]
-    classifier = JavaClassImpl@6875['Component']
+    classifier = JavaClassImpl@6956['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7022['Component'] {
     arguments = ArrayList@7023[empty]
-    classifier = JavaClassImpl@6974['Component']
+    classifier = JavaClassImpl@6854['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7024['Component'] {
     arguments = ArrayList@7025[empty]
-    classifier = JavaClassImpl@6977['Component']
+    classifier = JavaClassImpl@6944['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7026['Component'] {
     arguments = ArrayList@7027[empty]
-    classifier = JavaClassImpl@6887['Component']
+    classifier = JavaClassImpl@7001['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7028['Component'] {
     arguments = ArrayList@7029[empty]
-    classifier = JavaClassImpl@7007['Component']
+    classifier = JavaClassImpl@6992['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7030['Component'] {
     arguments = ArrayList@7031[empty]
-    classifier = JavaClassImpl@6989['Component']
+    classifier = JavaClassImpl@6878['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7032['Component'] {
     arguments = ArrayList@7033[empty]
-    classifier = JavaClassImpl@6869['Component']
+    classifier = JavaClassImpl@6911['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7034['Component'] {
     arguments = ArrayList@7035[empty]
-    classifier = JavaClassImpl@6842['Component']
+    classifier = JavaClassImpl@6959['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7036['Component'] {
     arguments = ArrayList@7037[empty]
-    classifier = JavaClassImpl@6932['Component']
+    classifier = JavaClassImpl@7010['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7038['Component'] {
     arguments = ArrayList@7039[empty]
-    classifier = JavaClassImpl@6827['Component']
+    classifier = JavaClassImpl@6890['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7040['Component'] {
     arguments = ArrayList@7041[empty]
-    classifier = JavaClassImpl@6860['Component']
+    classifier = JavaClassImpl@6986['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7042['Component'] {
     arguments = ArrayList@7043[empty]
-    classifier = JavaClassImpl@6941['Component']
+    classifier = JavaClassImpl@6836['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7044['Component'] {
     arguments = ArrayList@7045[empty]
-    classifier = JavaClassImpl@6848['Component']
+    classifier = JavaClassImpl@6965['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7046['Component'] {
     arguments = ArrayList@7047[empty]
-    classifier = JavaClassImpl@6959['Component']
+    classifier = JavaClassImpl@6887['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7048['Component'] {
     arguments = ArrayList@7049[empty]
-    classifier = JavaClassImpl@6830['Component']
+    classifier = JavaClassImpl@6833['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7050['Component'] {
     arguments = ArrayList@7051[empty]
-    classifier = JavaClassImpl@6854['Component']
+    classifier = JavaClassImpl@6923['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7052['Component'] {
     arguments = ArrayList@7053[empty]
-    classifier = JavaClassImpl@6986['Component']
+    classifier = JavaClassImpl@6863['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7054['Component'] {
     arguments = ArrayList@7055[empty]
-    classifier = JavaClassImpl@6836['Component']
+    classifier = JavaClassImpl@6983['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7056['Component'] {
     arguments = ArrayList@7057[empty]
-    classifier = JavaClassImpl@6902['Component']
+    classifier = JavaClassImpl@6917['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7058['Component'] {
     arguments = ArrayList@7059[empty]
-    classifier = JavaClassImpl@6872['Component']
+    classifier = JavaClassImpl@6926['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7060['Component'] {
     arguments = ArrayList@7061[empty]
-    classifier = JavaClassImpl@6995['Component']
+    classifier = JavaClassImpl@6974['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7062['Component'] {
     arguments = ArrayList@7063[empty]
-    classifier = JavaClassImpl@6857['Component']
+    classifier = JavaClassImpl@6869['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7064['Component'] {
     arguments = ArrayList@7065[empty]
-    classifier = JavaClassImpl@6950['Component']
+    classifier = JavaClassImpl@7013['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7066['Component'] {
     arguments = ArrayList@7067[empty]
-    classifier = JavaClassImpl@7010['Component']
+    classifier = JavaClassImpl@6977['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7068['Component'] {
     arguments = ArrayList@7069[empty]
-    classifier = JavaClassImpl@6980['Component']
+    classifier = JavaClassImpl@6884['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7070['Component'] {
     arguments = ArrayList@7071[empty]
-    classifier = JavaClassImpl@6983['Component']
+    classifier = JavaClassImpl@6896['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7072['Component'] {
     arguments = ArrayList@7073[empty]
-    classifier = JavaClassImpl@6944['Component']
+    classifier = JavaClassImpl@6839['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
@@ -5233,224 +5233,224 @@ LazyJavaClassifierType@7074['Component'] {
 
 LazyJavaClassifierType@7076['Component'] {
     arguments = ArrayList@7077[empty]
-    classifier = JavaClassImpl@6851['Component']
+    classifier = JavaClassImpl@6848['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7078['Component'] {
     arguments = ArrayList@7079[empty]
-    classifier = JavaClassImpl@6926['Component']
+    classifier = JavaClassImpl@6908['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7080['Component'] {
     arguments = ArrayList@7081[empty]
-    classifier = JavaClassImpl@6893['Component']
+    classifier = JavaClassImpl@6899['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7082['Component'] {
     arguments = ArrayList@7083[empty]
-    classifier = JavaClassImpl@6884['Component']
+    classifier = JavaClassImpl@6827['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7084['Component'] {
     arguments = ArrayList@7085[empty]
-    classifier = JavaClassImpl@6938['Component']
+    classifier = JavaClassImpl@6989['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7086['Component'] {
     arguments = ArrayList@7087[empty]
-    classifier = JavaClassImpl@7004['Component']
+    classifier = JavaClassImpl@6995['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7088['Component'] {
     arguments = ArrayList@7089[empty]
-    classifier = JavaClassImpl@6905['Component']
+    classifier = JavaClassImpl@6950['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7090['Component'] {
     arguments = ArrayList@7091[empty]
-    classifier = JavaClassImpl@6956['Component']
+    classifier = JavaClassImpl@6914['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7092['Component'] {
     arguments = ArrayList@7093[empty]
-    classifier = JavaClassImpl@6917['Component']
+    classifier = JavaClassImpl@6935['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7094['Component'] {
     arguments = ArrayList@7095[empty]
-    classifier = JavaClassImpl@6866['Component']
+    classifier = JavaClassImpl@6998['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7096['Component'] {
     arguments = ArrayList@7097[empty]
-    classifier = JavaClassImpl@6929['Component']
+    classifier = JavaClassImpl@6845['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7098['Component'] {
     arguments = ArrayList@7099[empty]
-    classifier = JavaClassImpl@7013['Component']
+    classifier = JavaClassImpl@6860['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7100['Component'] {
     arguments = ArrayList@7101[empty]
-    classifier = JavaClassImpl@6962['Component']
+    classifier = JavaClassImpl@6941['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7102['Component'] {
     arguments = ArrayList@7103[empty]
-    classifier = JavaClassImpl@6947['Component']
+    classifier = JavaClassImpl@6866['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7104['Component'] {
     arguments = ArrayList@7105[empty]
-    classifier = JavaClassImpl@6845['Component']
+    classifier = JavaClassImpl@7007['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7106['Component'] {
     arguments = ArrayList@7107[empty]
-    classifier = JavaClassImpl@6920['Component']
+    classifier = JavaClassImpl@6980['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7108['Component'] {
     arguments = ArrayList@7109[empty]
-    classifier = JavaClassImpl@6881['Component']
+    classifier = JavaClassImpl@6929['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7110['Component'] {
     arguments = ArrayList@7111[empty]
-    classifier = JavaClassImpl@6899['Component']
+    classifier = JavaClassImpl@6842['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7112['Component'] {
     arguments = ArrayList@7113[empty]
-    classifier = JavaClassImpl@6890['Component']
+    classifier = JavaClassImpl@6893['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7114['Component'] {
     arguments = ArrayList@7115[empty]
-    classifier = JavaClassImpl@6839['Component']
+    classifier = JavaClassImpl@6902['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7116['Component'] {
     arguments = ArrayList@7117[empty]
-    classifier = JavaClassImpl@7001['Component']
+    classifier = JavaClassImpl@6932['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7118['Component'] {
     arguments = ArrayList@7119[empty]
-    classifier = JavaClassImpl@6914['Component']
+    classifier = JavaClassImpl@6851['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7120['Component'] {
     arguments = ArrayList@7121[empty]
-    classifier = JavaClassImpl@6965['Component']
+    classifier = JavaClassImpl@6857['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7122['Component'] {
     arguments = ArrayList@7123[empty]
-    classifier = JavaClassImpl@6833['Component']
+    classifier = JavaClassImpl@6872['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7124['Component'] {
     arguments = ArrayList@7125[empty]
-    classifier = JavaClassImpl@6992['Component']
+    classifier = JavaClassImpl@6881['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7126['Component'] {
     arguments = ArrayList@7127[empty]
-    classifier = JavaClassImpl@6863['Component']
+    classifier = JavaClassImpl@6938['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7128['Component'] {
     arguments = ArrayList@7129[empty]
-    classifier = JavaClassImpl@6968['Component']
+    classifier = JavaClassImpl@6953['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7130['Component'] {
     arguments = ArrayList@7131[empty]
-    classifier = JavaClassImpl@6998['Component']
+    classifier = JavaClassImpl@7004['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7132['Component'] {
     arguments = ArrayList@7133[empty]
-    classifier = JavaClassImpl@6923['Component']
+    classifier = JavaClassImpl@6905['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7134['Component'] {
     arguments = ArrayList@7135[empty]
-    classifier = JavaClassImpl@6908['Component']
+    classifier = JavaClassImpl@6875['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7136['Component'] {
     arguments = ArrayList@7137[empty]
-    classifier = JavaClassImpl@6896['Component']
+    classifier = JavaClassImpl@6968['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
 
 LazyJavaClassifierType@7138['Component'] {
     arguments = ArrayList@7139[empty]
-    classifier = JavaClassImpl@6911['Component']
+    classifier = JavaClassImpl@6920['Component']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@1343['Component']
 }
@@ -5748,112 +5748,112 @@ LazyJavaClassifierType@7246['Container'] {
 
 LazyJavaClassifierType@7249['Container'] {
     arguments = ArrayList@7250[empty]
-    classifier = JavaClassImpl@7242['Container']
+    classifier = JavaClassImpl@7245['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7251['Container'] {
     arguments = ArrayList@7252[empty]
-    classifier = JavaClassImpl@7245['Container']
+    classifier = JavaClassImpl@7191['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7253['Container'] {
     arguments = ArrayList@7254[empty]
-    classifier = JavaClassImpl@7221['Container']
+    classifier = JavaClassImpl@7239['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7255['Container'] {
     arguments = ArrayList@7256[empty]
-    classifier = JavaClassImpl@7239['Container']
+    classifier = JavaClassImpl@7188['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7257['Container'] {
     arguments = ArrayList@7258[empty]
-    classifier = JavaClassImpl@7194['Container']
+    classifier = JavaClassImpl@7212['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7259['Container'] {
     arguments = ArrayList@7260[empty]
-    classifier = JavaClassImpl@7206['Container']
+    classifier = JavaClassImpl@7215['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7261['Container'] {
     arguments = ArrayList@7262[empty]
-    classifier = JavaClassImpl@7236['Container']
+    classifier = JavaClassImpl@7197['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7263['Container'] {
     arguments = ArrayList@7264[empty]
-    classifier = JavaClassImpl@7197['Container']
+    classifier = JavaClassImpl@7242['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7265['Container'] {
     arguments = ArrayList@7266[empty]
-    classifier = JavaClassImpl@7224['Container']
+    classifier = JavaClassImpl@7209['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7267['Container'] {
     arguments = ArrayList@7268[empty]
-    classifier = JavaClassImpl@7230['Container']
+    classifier = JavaClassImpl@7203['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7269['Container'] {
     arguments = ArrayList@7270[empty]
-    classifier = JavaClassImpl@7203['Container']
+    classifier = JavaClassImpl@7194['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7271['Container'] {
     arguments = ArrayList@7272[empty]
-    classifier = JavaClassImpl@7191['Container']
+    classifier = JavaClassImpl@7224['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7273['Container'] {
     arguments = ArrayList@7274[empty]
-    classifier = JavaClassImpl@7215['Container']
+    classifier = JavaClassImpl@7227['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7275['Container'] {
     arguments = ArrayList@7276[empty]
-    classifier = JavaClassImpl@7248['Container']
+    classifier = JavaClassImpl@7221['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7277['Container'] {
     arguments = ArrayList@7278[empty]
-    classifier = JavaClassImpl@7218['Container']
+    classifier = JavaClassImpl@7206['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7279['Container'] {
     arguments = ArrayList@7280[empty]
-    classifier = JavaClassImpl@7212['Container']
+    classifier = JavaClassImpl@7248['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
@@ -5867,7 +5867,7 @@ LazyJavaClassifierType@7281['Container'] {
 
 LazyJavaClassifierType@7283['Container'] {
     arguments = ArrayList@7284[empty]
-    classifier = JavaClassImpl@7188['Container']
+    classifier = JavaClassImpl@7236['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
@@ -5881,14 +5881,14 @@ LazyJavaClassifierType@7285['Container'] {
 
 LazyJavaClassifierType@7287['Container'] {
     arguments = ArrayList@7288[empty]
-    classifier = JavaClassImpl@7209['Container']
+    classifier = JavaClassImpl@7218['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
 
 LazyJavaClassifierType@7289['Container'] {
     arguments = ArrayList@7290[empty]
-    classifier = JavaClassImpl@7227['Container']
+    classifier = JavaClassImpl@7230['Container']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2408['Container']
 }
@@ -6211,154 +6211,154 @@ LazyJavaClassifierType@7408['Dimension'] {
 
 LazyJavaClassifierType@7411['Dimension'] {
     arguments = ArrayList@7412[empty]
-    classifier = JavaClassImpl@7404['Dimension']
+    classifier = JavaClassImpl@7359['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7413['Dimension'] {
     arguments = ArrayList@7414[empty]
-    classifier = JavaClassImpl@7389['Dimension']
+    classifier = JavaClassImpl@7401['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7415['Dimension'] {
     arguments = ArrayList@7416[empty]
-    classifier = JavaClassImpl@7395['Dimension']
+    classifier = JavaClassImpl@7350['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7417['Dimension'] {
     arguments = ArrayList@7418[empty]
-    classifier = JavaClassImpl@7353['Dimension']
+    classifier = JavaClassImpl@7362['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7419['Dimension'] {
     arguments = ArrayList@7420[empty]
-    classifier = JavaClassImpl@7350['Dimension']
+    classifier = JavaClassImpl@7404['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7421['Dimension'] {
     arguments = ArrayList@7422[empty]
-    classifier = JavaClassImpl@7344['Dimension']
+    classifier = JavaClassImpl@7341['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7423['Dimension'] {
     arguments = ArrayList@7424[empty]
-    classifier = JavaClassImpl@7410['Dimension']
+    classifier = JavaClassImpl@7392['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7425['Dimension'] {
     arguments = ArrayList@7426[empty]
-    classifier = JavaClassImpl@7368['Dimension']
+    classifier = JavaClassImpl@7407['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7427['Dimension'] {
     arguments = ArrayList@7428[empty]
-    classifier = JavaClassImpl@7341['Dimension']
+    classifier = JavaClassImpl@7365['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7429['Dimension'] {
     arguments = ArrayList@7430[empty]
-    classifier = JavaClassImpl@7407['Dimension']
+    classifier = JavaClassImpl@7368['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7431['Dimension'] {
     arguments = ArrayList@7432[empty]
-    classifier = JavaClassImpl@7347['Dimension']
+    classifier = JavaClassImpl@7398['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7433['Dimension'] {
     arguments = ArrayList@7434[empty]
-    classifier = JavaClassImpl@7356['Dimension']
+    classifier = JavaClassImpl@7377['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7435['Dimension'] {
     arguments = ArrayList@7436[empty]
-    classifier = JavaClassImpl@7392['Dimension']
+    classifier = JavaClassImpl@7389['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7437['Dimension'] {
     arguments = ArrayList@7438[empty]
-    classifier = JavaClassImpl@7374['Dimension']
+    classifier = JavaClassImpl@7395['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7439['Dimension'] {
     arguments = ArrayList@7440[empty]
-    classifier = JavaClassImpl@7380['Dimension']
+    classifier = JavaClassImpl@7344['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7441['Dimension'] {
     arguments = ArrayList@7442[empty]
-    classifier = JavaClassImpl@7371['Dimension']
+    classifier = JavaClassImpl@7347['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7443['Dimension'] {
     arguments = ArrayList@7444[empty]
-    classifier = JavaClassImpl@7386['Dimension']
+    classifier = JavaClassImpl@7374['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7445['Dimension'] {
     arguments = ArrayList@7446[empty]
-    classifier = JavaClassImpl@7365['Dimension']
+    classifier = JavaClassImpl@7380['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7447['Dimension'] {
     arguments = ArrayList@7448[empty]
-    classifier = JavaClassImpl@7401['Dimension']
+    classifier = JavaClassImpl@7386['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7449['Dimension'] {
     arguments = ArrayList@7450[empty]
-    classifier = JavaClassImpl@7362['Dimension']
+    classifier = JavaClassImpl@7371['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7451['Dimension'] {
     arguments = ArrayList@7452[empty]
-    classifier = JavaClassImpl@7398['Dimension']
+    classifier = JavaClassImpl@7356['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
 
 LazyJavaClassifierType@7453['Dimension'] {
     arguments = ArrayList@7454[empty]
-    classifier = JavaClassImpl@7377['Dimension']
+    classifier = JavaClassImpl@7410['Dimension']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2410['Dimension']
 }
@@ -6372,7 +6372,7 @@ LazyJavaClassifierType@7455['Dimension'] {
 
 LazyJavaClassifierType@7457['Dimension'] {
     arguments = ArrayList@7458[empty]
-    classifier = JavaClassImpl@7359['Dimension']
+    classifier = JavaClassImpl@7353['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@7542['EventTargetFilter']
+    classifier = JavaClassImpl@7539['EventTargetFilter']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@2415['EventTargetFilter']
 }
 
 LazyJavaClassifierType@7545['EventTargetFilter'] {
     arguments = ArrayList@7546[empty]
-    classifier = JavaClassImpl@7539['EventTargetFilter']
+    classifier = JavaClassImpl@7542['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@7978['List']
+    classifier = JavaClassImpl@7974['List']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@7963
 }
 
 LazyJavaClassifierType@7982['List<Image>'] {
     arguments = ArrayList@7983[1] { TypeProjectionImpl@7984 }
-    classifier = JavaClassImpl@7974['List']
+    classifier = JavaClassImpl@7978['List']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@7963
 }
@@ -8017,21 +8017,21 @@ LazyJavaClassifierType@7994['Locale'] {
 
 LazyJavaClassifierType@7997['Locale'] {
     arguments = ArrayList@7998[empty]
-    classifier = JavaClassImpl@7996['Locale']
+    classifier = JavaClassImpl@7993['Locale']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
 }
 
 LazyJavaClassifierType@7999['Locale'] {
     arguments = ArrayList@8000[empty]
-    classifier = JavaClassImpl@7990['Locale']
+    classifier = JavaClassImpl@7996['Locale']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
 }
 
 LazyJavaClassifierType@8001['Locale'] {
     arguments = ArrayList@8002[empty]
-    classifier = JavaClassImpl@7993['Locale']
+    classifier = JavaClassImpl@7990['Locale']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5057['Locale']
 }
@@ -8448,14 +8448,14 @@ LazyJavaClassifierType@8143['Object'] {
 
 LazyJavaClassifierType@8146['Object'] {
     arguments = ArrayList@8147[empty]
-    classifier = JavaClassImpl@8130['Object']
+    classifier = JavaClassImpl@8142['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8148['Object'] {
     arguments = ArrayList@8149[empty]
-    classifier = JavaClassImpl@8105['Object']
+    classifier = JavaClassImpl@8130['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
@@ -8469,63 +8469,63 @@ LazyJavaClassifierType@8150['Object'] {
 
 LazyJavaClassifierType@8152['Object'] {
     arguments = ArrayList@8153[empty]
-    classifier = JavaClassImpl@8136['Object']
+    classifier = JavaClassImpl@8133['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8154['Object'] {
     arguments = ArrayList@8155[empty]
-    classifier = JavaClassImpl@8118['Object']
+    classifier = JavaClassImpl@8124['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8156['Object'] {
     arguments = ArrayList@8157[empty]
-    classifier = JavaClassImpl@8127['Object']
+    classifier = JavaClassImpl@8115['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8158['Object'] {
     arguments = ArrayList@8159[empty]
-    classifier = JavaClassImpl@8115['Object']
+    classifier = JavaClassImpl@8127['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8160['Object'] {
     arguments = ArrayList@8161[empty]
-    classifier = JavaClassImpl@8121['Object']
+    classifier = JavaClassImpl@8112['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8162['Object'] {
     arguments = ArrayList@8163[empty]
-    classifier = JavaClassImpl@8133['Object']
+    classifier = JavaClassImpl@8118['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8164['Object'] {
     arguments = ArrayList@8165[empty]
-    classifier = JavaClassImpl@8124['Object']
+    classifier = JavaClassImpl@8136['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8166['Object'] {
     arguments = ArrayList@8167[empty]
-    classifier = JavaClassImpl@8142['Object']
+    classifier = JavaClassImpl@8105['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
 
 LazyJavaClassifierType@8168['Object'] {
     arguments = ArrayList@8169[empty]
-    classifier = JavaClassImpl@8112['Object']
+    classifier = JavaClassImpl@8145['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
@@ -8539,7 +8539,7 @@ LazyJavaClassifierType@8170['Object'] {
 
 LazyJavaClassifierType@8172['Object'] {
     arguments = ArrayList@8173[empty]
-    classifier = JavaClassImpl@8145['Object']
+    classifier = JavaClassImpl@8121['Object']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8106
 }
@@ -8596,35 +8596,35 @@ LazyJavaClassifierType@8192['ObjectInputStream'] {
 
 LazyJavaClassifierType@8195['ObjectInputStream'] {
     arguments = ArrayList@8196[empty]
-    classifier = JavaClassImpl@8188['ObjectInputStream']
+    classifier = JavaClassImpl@8185['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
 
 LazyJavaClassifierType@8197['ObjectInputStream'] {
     arguments = ArrayList@8198[empty]
-    classifier = JavaClassImpl@8194['ObjectInputStream']
+    classifier = JavaClassImpl@8191['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
 
 LazyJavaClassifierType@8199['ObjectInputStream'] {
     arguments = ArrayList@8200[empty]
-    classifier = JavaClassImpl@8182['ObjectInputStream']
+    classifier = JavaClassImpl@8194['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
 
 LazyJavaClassifierType@8201['ObjectInputStream'] {
     arguments = ArrayList@8202[empty]
-    classifier = JavaClassImpl@8185['ObjectInputStream']
+    classifier = JavaClassImpl@8182['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
 
 LazyJavaClassifierType@8203['ObjectInputStream'] {
     arguments = ArrayList@8204[empty]
-    classifier = JavaClassImpl@8191['ObjectInputStream']
+    classifier = JavaClassImpl@8188['ObjectInputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5059['ObjectInputStream']
 }
@@ -8659,7 +8659,7 @@ LazyJavaClassifierType@8214['ObjectOutputStream'] {
 
 LazyJavaClassifierType@8217['ObjectOutputStream'] {
     arguments = ArrayList@8218[empty]
-    classifier = JavaClassImpl@8213['ObjectOutputStream']
+    classifier = JavaClassImpl@8210['ObjectOutputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
 }
@@ -8673,14 +8673,14 @@ LazyJavaClassifierType@8219['ObjectOutputStream'] {
 
 LazyJavaClassifierType@8221['ObjectOutputStream'] {
     arguments = ArrayList@8222[empty]
-    classifier = JavaClassImpl@8216['ObjectOutputStream']
+    classifier = JavaClassImpl@8213['ObjectOutputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
 }
 
 LazyJavaClassifierType@8223['ObjectOutputStream'] {
     arguments = ArrayList@8224[empty]
-    classifier = JavaClassImpl@8210['ObjectOutputStream']
+    classifier = JavaClassImpl@8216['ObjectOutputStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5061['ObjectOutputStream']
 }
@@ -8960,21 +8960,21 @@ LazyJavaClassifierType@8315['PrintStream'] {
 
 LazyJavaClassifierType@8318['PrintStream'] {
     arguments = ArrayList@8319[empty]
-    classifier = JavaClassImpl@8317['PrintStream']
+    classifier = JavaClassImpl@8311['PrintStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
 }
 
 LazyJavaClassifierType@8320['PrintStream'] {
     arguments = ArrayList@8321[empty]
-    classifier = JavaClassImpl@8314['PrintStream']
+    classifier = JavaClassImpl@8317['PrintStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
 }
 
 LazyJavaClassifierType@8322['PrintStream'] {
     arguments = ArrayList@8323[empty]
-    classifier = JavaClassImpl@8311['PrintStream']
+    classifier = JavaClassImpl@8314['PrintStream']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5063['PrintStream']
 }
@@ -9414,7 +9414,7 @@ LazyJavaClassifierType@8466['Set'] {
 
 LazyJavaClassifierType@8470['Set'] {
     arguments = ArrayList@8471[1] { LazyStarProjection@8472 }
-    classifier = JavaClassImpl@8469['Set']
+    classifier = JavaClassImpl@8460['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
@@ -9428,7 +9428,7 @@ LazyJavaClassifierType@8474['Set'] {
 
 LazyJavaClassifierType@8477['Set'] {
     arguments = ArrayList@8478[1] { LazyStarProjection@8479 }
-    classifier = JavaClassImpl@8460['Set']
+    classifier = JavaClassImpl@8469['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@8508['Set']
+    classifier = JavaClassImpl@8504['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
 
 LazyJavaClassifierType@8516['Set<AWTKeyStroke>'] {
     arguments = ArrayList@8517[1] { TypeProjectionImpl@8518 }
-    classifier = JavaClassImpl@8512['Set']
+    classifier = JavaClassImpl@8508['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
 
 LazyJavaClassifierType@8519['Set<AWTKeyStroke>'] {
     arguments = ArrayList@8520[1] { TypeProjectionImpl@8521 }
-    classifier = JavaClassImpl@8504['Set']
+    classifier = JavaClassImpl@8512['Set']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8473
 }
@@ -9819,98 +9819,98 @@ LazyJavaClassifierType@8644['String'] {
 
 LazyJavaClassifierType@8647['String'] {
     arguments = ArrayList@8648[empty]
-    classifier = JavaClassImpl@8610['String']
+    classifier = JavaClassImpl@8628['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8649['String'] {
     arguments = ArrayList@8650[empty]
-    classifier = JavaClassImpl@8625['String']
+    classifier = JavaClassImpl@8598['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8651['String'] {
     arguments = ArrayList@8652[empty]
-    classifier = JavaClassImpl@8586['String']
+    classifier = JavaClassImpl@8580['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8653['String'] {
     arguments = ArrayList@8654[empty]
-    classifier = JavaClassImpl@8646['String']
+    classifier = JavaClassImpl@8547['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8655['String'] {
     arguments = ArrayList@8656[empty]
-    classifier = JavaClassImpl@8616['String']
+    classifier = JavaClassImpl@8583['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8657['String'] {
     arguments = ArrayList@8658[empty]
-    classifier = JavaClassImpl@8613['String']
+    classifier = JavaClassImpl@8553['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8659['String'] {
     arguments = ArrayList@8660[empty]
-    classifier = JavaClassImpl@8607['String']
+    classifier = JavaClassImpl@8616['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8661['String'] {
     arguments = ArrayList@8662[empty]
-    classifier = JavaClassImpl@8568['String']
+    classifier = JavaClassImpl@8622['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8663['String'] {
     arguments = ArrayList@8664[empty]
-    classifier = JavaClassImpl@8544['String']
+    classifier = JavaClassImpl@8595['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8665['String'] {
     arguments = ArrayList@8666[empty]
-    classifier = JavaClassImpl@8601['String']
+    classifier = JavaClassImpl@8556['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8667['String'] {
     arguments = ArrayList@8668[empty]
-    classifier = JavaClassImpl@8595['String']
+    classifier = JavaClassImpl@8565['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8669['String'] {
     arguments = ArrayList@8670[empty]
-    classifier = JavaClassImpl@8556['String']
+    classifier = JavaClassImpl@8634['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8671['String'] {
     arguments = ArrayList@8672[empty]
-    classifier = JavaClassImpl@8598['String']
+    classifier = JavaClassImpl@8568['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8673['String'] {
     arguments = ArrayList@8674[empty]
-    classifier = JavaClassImpl@8565['String']
+    classifier = JavaClassImpl@8571['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
@@ -9924,14 +9924,14 @@ LazyJavaClassifierType@8675['String'] {
 
 LazyJavaClassifierType@8677['String'] {
     arguments = ArrayList@8678[empty]
-    classifier = JavaClassImpl@8622['String']
+    classifier = JavaClassImpl@8574['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8679['String'] {
     arguments = ArrayList@8680[empty]
-    classifier = JavaClassImpl@8637['String']
+    classifier = JavaClassImpl@8610['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
@@ -9945,133 +9945,133 @@ LazyJavaClassifierType@8681['String'] {
 
 LazyJavaClassifierType@8683['String'] {
     arguments = ArrayList@8684[empty]
-    classifier = JavaClassImpl@8628['String']
+    classifier = JavaClassImpl@8607['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8685['String'] {
     arguments = ArrayList@8686[empty]
-    classifier = JavaClassImpl@8559['String']
+    classifier = JavaClassImpl@8601['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8687['String'] {
     arguments = ArrayList@8688[empty]
-    classifier = JavaClassImpl@8553['String']
+    classifier = JavaClassImpl@8613['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8689['String'] {
     arguments = ArrayList@8690[empty]
-    classifier = JavaClassImpl@8634['String']
+    classifier = JavaClassImpl@8537['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8691['String'] {
     arguments = ArrayList@8692[empty]
-    classifier = JavaClassImpl@8583['String']
+    classifier = JavaClassImpl@8619['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8693['String'] {
     arguments = ArrayList@8694[empty]
-    classifier = JavaClassImpl@8619['String']
+    classifier = JavaClassImpl@8589['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8695['String'] {
     arguments = ArrayList@8696[empty]
-    classifier = JavaClassImpl@8604['String']
+    classifier = JavaClassImpl@8640['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8697['String'] {
     arguments = ArrayList@8698[empty]
-    classifier = JavaClassImpl@8589['String']
+    classifier = JavaClassImpl@8541['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8699['String'] {
     arguments = ArrayList@8700[empty]
-    classifier = JavaClassImpl@8574['String']
+    classifier = JavaClassImpl@8631['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8701['String'] {
     arguments = ArrayList@8702[empty]
-    classifier = JavaClassImpl@8541['String']
+    classifier = JavaClassImpl@8637['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8703['String'] {
     arguments = ArrayList@8704[empty]
-    classifier = JavaClassImpl@8571['String']
+    classifier = JavaClassImpl@8550['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8705['String'] {
     arguments = ArrayList@8706[empty]
-    classifier = JavaClassImpl@8631['String']
+    classifier = JavaClassImpl@8646['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8707['String'] {
     arguments = ArrayList@8708[empty]
-    classifier = JavaClassImpl@8562['String']
+    classifier = JavaClassImpl@8643['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8709['String'] {
     arguments = ArrayList@8710[empty]
-    classifier = JavaClassImpl@8580['String']
+    classifier = JavaClassImpl@8625['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8711['String'] {
     arguments = ArrayList@8712[empty]
-    classifier = JavaClassImpl@8640['String']
+    classifier = JavaClassImpl@8586['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8713['String'] {
     arguments = ArrayList@8714[empty]
-    classifier = JavaClassImpl@8537['String']
+    classifier = JavaClassImpl@8559['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8715['String'] {
     arguments = ArrayList@8716[empty]
-    classifier = JavaClassImpl@8550['String']
+    classifier = JavaClassImpl@8544['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8717['String'] {
     arguments = ArrayList@8718[empty]
-    classifier = JavaClassImpl@8643['String']
+    classifier = JavaClassImpl@8562['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
 
 LazyJavaClassifierType@8719['String'] {
     arguments = ArrayList@8720[empty]
-    classifier = JavaClassImpl@8547['String']
+    classifier = JavaClassImpl@8604['String']
     nullable = 'true': Boolean@6596
     typeConstructor = DeserializedClassTypeConstructor@8538
 }
@@ -10087,49 +10087,49 @@ LazyJavaClassifierType@8725['T'] {
     arguments = ArrayList@8726[empty]
     classifier = JavaTypeParameterImpl@8727['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
 }
 
-LazyJavaClassifierType@8728['T'] {
-    arguments = ArrayList@8729[empty]
-    classifier = JavaTypeParameterImpl@8730['T']
+LazyJavaClassifierType@8729['T'] {
+    arguments = ArrayList@8730[empty]
+    classifier = JavaTypeParameterImpl@8731['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
 LazyJavaClassifierType@8732['T'] {
     arguments = ArrayList@8733[empty]
     classifier = JavaTypeParameterImpl@8734['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
-LazyJavaClassifierType@8735['T'] {
-    arguments = ArrayList@8736[empty]
-    classifier = JavaTypeParameterImpl@8737['T']
+LazyJavaClassifierType@8736['T'] {
+    arguments = ArrayList@8737[empty]
+    classifier = JavaTypeParameterImpl@8738['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8738
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
 LazyJavaClassifierType@8739['T'] {
     arguments = ArrayList@8740[empty]
     classifier = JavaTypeParameterImpl@8741['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
 LazyJavaClassifierType@8742['T'] {
     arguments = ArrayList@8743[empty]
     classifier = JavaTypeParameterImpl@8744['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8738
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
 }
 
 LazyJavaClassifierType@8745['T'] {
     arguments = ArrayList@8746[empty]
     classifier = JavaTypeParameterImpl@8747['T']
     nullable = 'false': Boolean@6567
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8738
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
 }
 
 LazyJavaClassifierType@8748['T'] {
@@ -10141,65 +10141,65 @@ LazyJavaClassifierType@8748['T'] {
 
 LazyJavaClassifierType@8751['T'] {
     arguments = ArrayList@8752[empty]
-    classifier = JavaTypeParameterImpl@8741['T']
+    classifier = JavaTypeParameterImpl@8738['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
 LazyJavaClassifierType@8753['T'] {
     arguments = ArrayList@8754[empty]
-    classifier = JavaTypeParameterImpl@8744['T']
+    classifier = JavaTypeParameterImpl@8747['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8738
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
 }
 
 LazyJavaClassifierType@8755['T'] {
     arguments = ArrayList@8756[empty]
-    classifier = JavaTypeParameterImpl@8747['T']
+    classifier = JavaTypeParameterImpl@8723['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8738
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
 LazyJavaClassifierType@8757['T'] {
     arguments = ArrayList@8758[empty]
-    classifier = JavaTypeParameterImpl@8727['T']
+    classifier = JavaTypeParameterImpl@8741['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
 LazyJavaClassifierType@8759['T'] {
     arguments = ArrayList@8760[empty]
     classifier = JavaTypeParameterImpl@8734['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
 }
 
 LazyJavaClassifierType@8761['T'] {
     arguments = ArrayList@8762[empty]
-    classifier = JavaTypeParameterImpl@8730['T']
+    classifier = JavaTypeParameterImpl@8750['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
 LazyJavaClassifierType@8763['T'] {
     arguments = ArrayList@8764[empty]
-    classifier = JavaTypeParameterImpl@8723['T']
+    classifier = JavaTypeParameterImpl@8744['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
 }
 
 LazyJavaClassifierType@8765['T'] {
     arguments = ArrayList@8766[empty]
-    classifier = JavaTypeParameterImpl@8737['T']
+    classifier = JavaTypeParameterImpl@8731['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8738
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
 }
 
 LazyJavaClassifierType@8767['T'] {
     arguments = ArrayList@8768[empty]
-    classifier = JavaTypeParameterImpl@8750['T']
+    classifier = JavaTypeParameterImpl@8727['T']
     nullable = 'true': Boolean@6596
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
 }
 
 LazyJavaClassifierType@8769['Toolkit'] {
@@ -10289,14 +10289,14 @@ LazyJavaClassifierType@8797['Type'] {
 
 LazyJavaClassifierType@8800['Type'] {
     arguments = ArrayList@8801[empty]
-    classifier = JavaClassImpl@8796['Type']
+    classifier = JavaClassImpl@8799['Type']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
 }
 
 LazyJavaClassifierType@8802['Type'] {
     arguments = ArrayList@8803[empty]
-    classifier = JavaClassImpl@8799['Type']
+    classifier = JavaClassImpl@8796['Type']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@5362['Type']
 }
@@ -10456,21 +10456,21 @@ LazyJavaClassifierType@8855['Window'] {
 
 LazyJavaClassifierType@8858['Window'] {
     arguments = ArrayList@8859[empty]
-    classifier = JavaClassImpl@8842['Window']
+    classifier = JavaClassImpl@8836['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8860['Window'] {
     arguments = ArrayList@8861[empty]
-    classifier = JavaClassImpl@8851['Window']
+    classifier = JavaClassImpl@8848['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8862['Window'] {
     arguments = ArrayList@8863[empty]
-    classifier = JavaClassImpl@8857['Window']
+    classifier = JavaClassImpl@8851['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
@@ -10484,7 +10484,7 @@ LazyJavaClassifierType@8864['Window'] {
 
 LazyJavaClassifierType@8866['Window'] {
     arguments = ArrayList@8867[empty]
-    classifier = JavaClassImpl@8839['Window']
+    classifier = JavaClassImpl@8857['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
@@ -10498,14 +10498,14 @@ LazyJavaClassifierType@8868['Window'] {
 
 LazyJavaClassifierType@8870['Window'] {
     arguments = ArrayList@8871[empty]
-    classifier = JavaClassImpl@8848['Window']
+    classifier = JavaClassImpl@8842['Window']
     nullable = 'true': Boolean@6596
     typeConstructor = LazyJavaClassTypeConstructor@6532['Window']
 }
 
 LazyJavaClassifierType@8872['Window'] {
     arguments = ArrayList@8873[empty]
-    classifier = JavaClassImpl@8836['Window']
+    classifier = JavaClassImpl@8839['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@6618['AWTKeyStroke']) = LazyJavaClassDescriptor@0['AWTKeyStroke']
+    topLevelClasses(JavaClassImpl@6639['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@7362['Dimension']) = LazyJavaClassDescriptor@2409['Dimension']
+    topLevelClasses(JavaClassImpl@7353['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@7990['Locale']) = LazyJavaClassDescriptor@5056['Locale']
-    topLevelClasses(JavaClassImpl@8191['ObjectInputStream']) = LazyJavaClassDescriptor@5058['ObjectInputStream']
-    topLevelClasses(JavaClassImpl@8210['ObjectOutputStream']) = LazyJavaClassDescriptor@5060['ObjectOutputStream']
+    topLevelClasses(JavaClassImpl@7987['Locale']) = LazyJavaClassDescriptor@5056['Locale']
+    topLevelClasses(JavaClassImpl@8182['ObjectInputStream']) = LazyJavaClassDescriptor@5058['ObjectInputStream']
+    topLevelClasses(JavaClassImpl@8216['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']
@@ -10734,53 +10734,59 @@ LazyJavaPackageFragment@8946['javax'] {
     memberIndex = computeMemberIndex$1@8966 // through LazyPackageFragmentScopeForJavaPackage@8964
 }
 
-LazyJavaPackageFragment@8941['lang'] {
-    deserializedPackageScope = Empty@8960 // through LazyPackageFragmentScopeForJavaPackage@8967
-}
-
 LazyJavaPackageFragment@8948['swing'] {
-    classes('JFrame': Name@8968) = LazyJavaClassDescriptor@3770['JFrame'] // through LazyPackageFragmentScopeForJavaPackage@8969
-    deserializedPackageScope = Empty@8960 // through LazyPackageFragmentScopeForJavaPackage@8969
-    functions('JFrame': Name@8970) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@8969
-    memberIndex = computeMemberIndex$1@8971 // through LazyPackageFragmentScopeForJavaPackage@8969
+    classes('JFrame': Name@8967) = LazyJavaClassDescriptor@3770['JFrame'] // through LazyPackageFragmentScopeForJavaPackage@8968
+    deserializedPackageScope = Empty@8960 // through LazyPackageFragmentScopeForJavaPackage@8968
+    functions('JFrame': Name@8969) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@8968
+    memberIndex = computeMemberIndex$1@8970 // through LazyPackageFragmentScopeForJavaPackage@8968
 }
 
-LazyJavaTypeParameterDescriptor@8972['T'] {
-    defaultType = JetTypeImpl@8973['T']
+LazyJavaTypeParameterDescriptor@8971['T'] {
+    defaultType = JetTypeImpl@8972['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8735
+    upperBounds = LinkedHashSet@8973[1] { DelegatingFlexibleType@8974 }
+    upperBoundsAsType = DelegatingFlexibleType@8974
+}
+
+LazyJavaTypeParameterDescriptor@8975['T'] {
+    defaultType = JetTypeImpl@8976['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8728
+    upperBounds = LinkedHashSet@8977[1] { DelegatingFlexibleType@8978 }
+    upperBoundsAsType = DelegatingFlexibleType@8978
+}
+
+LazyJavaTypeParameterDescriptor@8979['T'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@8724
-    upperBounds = LinkedHashSet@8974[1] { DelegatingFlexibleType@8975 }
-    upperBoundsAsType = DelegatingFlexibleType@8975
-}
-
-LazyJavaTypeParameterDescriptor@8976['T'] {
-    defaultType = JetTypeImpl@8977['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8731
-    upperBounds = LinkedHashSet@8978[1] { DelegatingFlexibleType@8979 }
-    upperBoundsAsType = DelegatingFlexibleType@8979
-}
-
-LazyJavaTypeParameterDescriptor@8980['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8738
-    upperBounds = LinkedHashSet@8981[1] { DelegatingFlexibleType@8982 }
-    upperBoundsAsType = DelegatingFlexibleType@8982
+    upperBounds = LinkedHashSet@8980[1] { DelegatingFlexibleType@8981 }
+    upperBoundsAsType = DelegatingFlexibleType@8981
 }
 
 LazyJavaTypeParameterDescriptor@6536['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8983
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@8982
 }
 
-LazyJavaTypeParameterResolver@8984 {
-    resolve(JavaTypeParameterImpl@8985['T']) = LazyJavaTypeParameterDescriptor@8972['T']
+LazyJavaTypeParameterResolver@8983 {
+    resolve(JavaTypeParameterImpl@8984['T']) = LazyJavaTypeParameterDescriptor@6536['T']
 }
 
-LazyJavaTypeParameterResolver@8986 {
-    resolve(JavaTypeParameterImpl@8987['T']) = LazyJavaTypeParameterDescriptor@8980['T']
+LazyJavaTypeParameterResolver@8985 {
+    resolve(JavaTypeParameterImpl@8986['T']) = LazyJavaTypeParameterDescriptor@8975['T']
 }
 
-LazyJavaTypeParameterResolver@8988 {
-    resolve(JavaTypeParameterImpl@8989['T']) = LazyJavaTypeParameterDescriptor@8976['T']
+LazyJavaTypeParameterResolver@8987 {
+    resolve(JavaTypeParameterImpl@8988['T']) = LazyJavaTypeParameterDescriptor@8979['T']
 }
 
-LazyJavaTypeParameterResolver@8990 {
-    resolve(JavaTypeParameterImpl@8991['T']) = LazyJavaTypeParameterDescriptor@6536['T']
+LazyJavaTypeParameterResolver@8989 {
+    resolve(JavaTypeParameterImpl@8990['T']) = LazyJavaTypeParameterDescriptor@8971['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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
index c45934de9c0..50f3ee69520 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1647.lazy.log
@@ -29,3 +29,13 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
index 202551656ad..c5bdc033ff3 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt1736.lazy.log
@@ -30,3 +30,63 @@ LazyJavaPackageFragment@9['lang'] {
     functions('method': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
index b0d628a1c3e..e9158027d97 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt174.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt174.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
 }
@@ -137,3 +137,24 @@ LazyJavaPackageFragment@55['lang'] {
     functions('Exception': Name@66) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@74
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@74
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
index 5b2725e04f6..1fe9363c957 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt201.lazy.log
@@ -115,3 +115,54 @@ LazyJavaPackageFragment@46['lang'] {
     functions('npe': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
+
+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> = 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]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[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[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+}
+
+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]
+    <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/regressions/kt235.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
index 84574bc6870..90a6e0a2a7a 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt235.lazy.log
@@ -37,17 +37,190 @@ LazyJavaPackageFragment@10['lang'] {
     classes('MyArray': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('MyArray1': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@36
     classes('MyNumber': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('inc': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plusAssign': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('set': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('plusAssign': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@36
     deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
     functions('MyArray': Name@35) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('MyArray1': Name@37) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     functions('MyNumber': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('inc': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@40) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plusAssign': Name@41) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('set': Name@42) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('plusAssign': Name@39) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@36
+}
+
+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]
+    <name not found> = EmptyList@33[empty]
+    <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]
+    <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@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@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 }
+}
+
+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> = 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[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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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@114 {
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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 1411923b0ed..079aa1856d9 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt2376.lazy.log
@@ -7,78 +7,88 @@ LazyJavaClassDescriptor@0['Test'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('number': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('number': Name@6) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['Test']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['Test']
 }
 
-LazyJavaClassTypeConstructor@13['Test'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['Test'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['Number'] {
-    arguments = ArrayList@18[empty]
-    classifier = JavaClassImpl@19['Number']
-    nullable = 'false': Boolean@20
-    typeConstructor = DeserializedClassTypeConstructor@21
+LazyJavaClassifierType@16['Number'] {
+    arguments = ArrayList@17[empty]
+    classifier = JavaClassImpl@18['Number']
+    nullable = 'false': Boolean@19
+    typeConstructor = DeserializedClassTypeConstructor@20
 }
 
-LazyJavaClassifierType@22['Number'] {
-    arguments = ArrayList@23[empty]
-    classifier = JavaClassImpl@19['Number']
-    nullable = 'true': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@21
+LazyJavaClassifierType@21['Number'] {
+    arguments = ArrayList@22[empty]
+    classifier = JavaClassImpl@18['Number']
+    nullable = 'true': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@20
 }
 
-LazyJavaClassifierType@25['Object'] {
-    classifier = JavaClassImpl@26['Object']
-    typeConstructor = DeserializedClassTypeConstructor@27
+LazyJavaClassifierType@24['Object'] {
+    classifier = JavaClassImpl@25['Object']
+    typeConstructor = DeserializedClassTypeConstructor@26
 }
 
-LazyJavaPackageFragmentProvider@28 {
-    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    packageFragments('Array': FqName@31) = null
-    packageFragments('String': FqName@32) = null
-    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    packageFragments('java.lang.Array': FqName@37) = null
-    packageFragments('java.lang.String': FqName@38) = null
-    packageFragments('kotlin': FqName@39) = null
-    packageFragments('kotlin.Array': FqName@40) = null
-    packageFragments('kotlin.String': FqName@41) = null
-    packageFragments('kotlin.io': FqName@42) = null
-    packageFragments('kotlin.jvm': FqName@43) = null
-    topLevelClasses(JavaClassImpl@44['Test']) = LazyJavaClassDescriptor@0['Test']
+LazyJavaPackageFragmentProvider@27 {
+    packageFragments('<root>': FqName@28) = LazyJavaPackageFragment@29['<root>']
+    packageFragments('Array': FqName@30) = null
+    packageFragments('String': FqName@31) = null
+    packageFragments('java': FqName@32) = LazyJavaPackageFragment@33['java']
+    packageFragments('java.lang': FqName@34) = LazyJavaPackageFragment@35['lang']
+    packageFragments('java.lang.Array': FqName@36) = null
+    packageFragments('java.lang.String': FqName@37) = null
+    packageFragments('kotlin': FqName@38) = null
+    packageFragments('kotlin.Array': FqName@39) = null
+    packageFragments('kotlin.String': FqName@40) = null
+    packageFragments('kotlin.io': FqName@41) = null
+    packageFragments('kotlin.jvm': FqName@42) = null
+    topLevelClasses(JavaClassImpl@43['Test']) = LazyJavaClassDescriptor@0['Test']
 }
 
-LazyJavaPackageFragment@30['<root>'] {
-    classes('Array': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('String': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('Test': Name@48) = LazyJavaClassDescriptor@0['Test'] // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('number': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    classes('toInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('Test': Name@48) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('number': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('toInt': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@46
+LazyJavaPackageFragment@29['<root>'] {
+    classes('Array': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('String': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('Test': Name@47) = LazyJavaClassDescriptor@0['Test'] // through LazyPackageFragmentScopeForJavaPackage@45
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@45
+    functions('Test': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@45
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@45
 }
 
-LazyJavaPackageFragment@34['java'] {
-    classes('lang': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('lang': Name@54) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@53
+LazyJavaPackageFragment@33['java'] {
+    classes('lang': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('lang': Name@53) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
-LazyJavaPackageFragment@36['lang'] {
-    classes('Test': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('number': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('toInt': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('Test': Name@48) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('number': Name@6) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('toInt': Name@49) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@56
+LazyJavaPackageFragment@35['lang'] {
+    classes('Test': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('Test': Name@47) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@55
+}
+
+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@65 {
+    <name not found> = ArrayList@66[1] { ResolutionCandidate@67 }
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@67 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
index fb2b5eb617b..6bd6cdfcd36 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt251.lazy.log
@@ -49,3 +49,41 @@ LazyJavaPackageFragment@14['lang'] {
     classes('x': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@38
 }
+
+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]
+    <name not found> = EmptyList@36[empty]
+}
+
+ResolutionTaskHolder@47 {
+    <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]
+}
+
+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]
+}
+
+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 eae462a0059..d2fc7575143 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@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-LazyJavaClassifierType@54['K'] {
-    arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@56['K']
+LazyJavaClassifierType@53['K'] {
+    arguments = ArrayList@54[empty]
+    classifier = JavaTypeParameterImpl@55['K']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-LazyJavaClassifierType@57['K'] {
-    arguments = ArrayList@58[empty]
-    classifier = JavaTypeParameterImpl@59['K']
+LazyJavaClassifierType@56['K'] {
+    arguments = ArrayList@57[empty]
+    classifier = JavaTypeParameterImpl@58['K']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@60['K'] {
@@ -91,35 +91,35 @@ LazyJavaClassifierType@60['K'] {
 
 LazyJavaClassifierType@63['K'] {
     arguments = ArrayList@64[empty]
-    classifier = JavaTypeParameterImpl@62['K']
+    classifier = JavaTypeParameterImpl@52['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@66['K'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@56['K']
+    classifier = JavaTypeParameterImpl@58['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaClassifierType@68['K'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@59['K']
+    classifier = JavaTypeParameterImpl@47['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@70['K'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@52['K']
+    classifier = JavaTypeParameterImpl@55['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaClassifierType@72['K'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@47['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
@@ -209,37 +209,37 @@ LazyJavaClassifierType@118['V'] {
 
 LazyJavaClassifierType@122['V'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@114['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@124['V'] {
     arguments = ArrayList@125[empty]
-    classifier = JavaTypeParameterImpl@120['V']
+    classifier = JavaTypeParameterImpl@117['V']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@126['V'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@117['V']
+    classifier = JavaTypeParameterImpl@107['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@114['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@107['V']
+    classifier = JavaTypeParameterImpl@120['V']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
 }
 
 LazyJavaPackageFragmentProvider@132 {
@@ -325,7 +325,7 @@ LazyJavaTypeParameterDescriptor@27['K'] {
 }
 
 LazyJavaTypeParameterDescriptor@22['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
 }
 
 LazyJavaTypeParameterDescriptor@28['V'] {
@@ -339,11 +339,34 @@ LazyJavaTypeParameterDescriptor@23['V'] {
 }
 
 LazyJavaTypeParameterResolver@192 {
-    resolve(JavaTypeParameterImpl@193['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@194['V']) = LazyJavaTypeParameterDescriptor@23['V']
+    resolve(JavaTypeParameterImpl@193['K']) = LazyJavaTypeParameterDescriptor@27['K']
+    resolve(JavaTypeParameterImpl@194['V']) = LazyJavaTypeParameterDescriptor@28['V']
 }
 
 LazyJavaTypeParameterResolver@195 {
-    resolve(JavaTypeParameterImpl@196['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@197['V']) = LazyJavaTypeParameterDescriptor@28['V']
+    resolve(JavaTypeParameterImpl@196['K']) = LazyJavaTypeParameterDescriptor@22['K']
+    resolve(JavaTypeParameterImpl@197['V']) = LazyJavaTypeParameterDescriptor@23['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@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@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/kt2768.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
index 5cda5d76b18..77e7a8ce0be 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt2768.lazy.log
@@ -62,14 +62,14 @@ LazyJavaClassifierType@35['String'] {
 
 LazyJavaClassifierType@38['String'] {
     arguments = ArrayList@39[empty]
-    classifier = JavaClassImpl@33['String']
+    classifier = JavaClassImpl@37['String']
     nullable = 'true': Boolean@30
     typeConstructor = DeserializedClassTypeConstructor@34
 }
 
 LazyJavaClassifierType@40['String'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@37['String']
+    classifier = JavaClassImpl@33['String']
     nullable = 'true': Boolean@30
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -127,44 +127,194 @@ LazyJavaPackageFragment@52['<root>'] {
     classes('Short': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('String': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('assertEquals': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('toByte': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('toInt': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('toShort': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('AssertionError': Name@78) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('assertEquals': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('toByte': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('toInt': Name@86) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('toShort': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('AssertionError': Name@78) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('assertEquals': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@92
-    functions('lang': Name@93) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@92
-    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('lang': Name@88) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@61['lang'] {
-    classes('AssertionError': Name@78) = LazyJavaClassDescriptor@5['AssertionError'] // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('assertEquals': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('equals': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('minus': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toByte': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toInt': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    classes('toShort': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@95
-    deserializedPackageScope = Empty@88 // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('AssertionError': Name@78) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('assertEquals': Name@82) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('equals': Name@83) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('minus': Name@84) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('toByte': Name@85) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('toInt': Name@86) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    functions('toShort': Name@87) = EmptyList@89[empty] // through LazyPackageFragmentScopeForJavaPackage@95
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@95
+    classes('AssertionError': Name@78) = LazyJavaClassDescriptor@5['AssertionError'] // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('assertEquals': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@90
+    functions('AssertionError': Name@78) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
+    functions('assertEquals': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
+    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
+}
+
+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> = 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]
+    <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]
+    <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 }
+    <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@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 }
+}
+
+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 }
+}
+
+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> = 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[8] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195, ... }
+    <name not found> = ArrayList@196[8] { 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, ... }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
index c7793367da8..7394d1904b4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt282.lazy.log
@@ -50,3 +50,102 @@ LazyJavaPackageFragment@12['lang'] {
     functions('plus': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+}
+
+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[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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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@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@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 183fc8ea9fa..4b6611c3f84 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt287.lazy.log
@@ -56,21 +56,21 @@ LazyJavaClassifierType@41['K'] {
     arguments = ArrayList@42[empty]
     classifier = JavaTypeParameterImpl@43['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@44['K'] {
     arguments = ArrayList@45[empty]
     classifier = JavaTypeParameterImpl@46['K']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@47['K'] {
     arguments = ArrayList@48[empty]
-    classifier = JavaTypeParameterImpl@39['K']
+    classifier = JavaTypeParameterImpl@46['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@50['K'] {
@@ -82,16 +82,16 @@ LazyJavaClassifierType@50['K'] {
 
 LazyJavaClassifierType@52['K'] {
     arguments = ArrayList@53[empty]
-    classifier = JavaTypeParameterImpl@43['K']
+    classifier = JavaTypeParameterImpl@39['K']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaClassifierType@54['K'] {
     arguments = ArrayList@55[empty]
-    classifier = JavaTypeParameterImpl@46['K']
+    classifier = JavaTypeParameterImpl@43['K']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
 LazyJavaClassifierType@56['Map<? extends K, ? extends V>'] {
@@ -154,28 +154,28 @@ LazyJavaClassifierType@89['V'] {
     arguments = ArrayList@90[empty]
     classifier = JavaTypeParameterImpl@91['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@92['V'] {
     arguments = ArrayList@93[empty]
     classifier = JavaTypeParameterImpl@94['V']
     nullable = 'false': Boolean@35
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@95['V'] {
     arguments = ArrayList@96[empty]
     classifier = JavaTypeParameterImpl@91['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@97['V'] {
     arguments = ArrayList@98[empty]
-    classifier = JavaTypeParameterImpl@83['V']
+    classifier = JavaTypeParameterImpl@94['V']
     nullable = 'true': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
 }
 
 LazyJavaClassifierType@99['V'] {
@@ -187,7 +187,7 @@ LazyJavaClassifierType@99['V'] {
 
 LazyJavaClassifierType@101['V'] {
     arguments = ArrayList@102[empty]
-    classifier = JavaTypeParameterImpl@94['V']
+    classifier = JavaTypeParameterImpl@83['V']
     nullable = 'true': Boolean@49
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
@@ -260,22 +260,22 @@ LazyJavaPackageFragment@118['util'] {
 
 LazyJavaTypeParameterDescriptor@18['K'] {
     defaultType = JetTypeImpl@149['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
     upperBounds = LinkedHashSet@150[1] { NullableType@151 }
 }
 
 LazyJavaTypeParameterDescriptor@13['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@40
 }
 
 LazyJavaTypeParameterDescriptor@19['V'] {
     defaultType = JetTypeImpl@152['V']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
     upperBounds = LinkedHashSet@153[1] { NullableType@154 }
 }
 
 LazyJavaTypeParameterDescriptor@14['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
 LazyJavaTypeParameterResolver@155 {
@@ -284,6 +284,42 @@ LazyJavaTypeParameterResolver@155 {
 }
 
 LazyJavaTypeParameterResolver@158 {
-    resolve(JavaTypeParameterImpl@34['K']) = LazyJavaTypeParameterDescriptor@13['K']
-    resolve(JavaTypeParameterImpl@87['V']) = LazyJavaTypeParameterDescriptor@14['V']
+    resolve(JavaTypeParameterImpl@39['K']) = LazyJavaTypeParameterDescriptor@13['K']
+    resolve(JavaTypeParameterImpl@83['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]
+    <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]
+    <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, ... }
+    <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 4f9e4b2b876..9ef3a9a7510 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt2956.lazy.log
@@ -34,3 +34,16 @@ LazyJavaPackageFragment@8['java'] {
 LazyJavaPackageFragment@10['lang'] {
     deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+ResolutionTaskHolder@28 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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/kt306.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
index af30b4dfe13..dbbd5c88a19 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt306.lazy.log
@@ -33,3 +33,35 @@ LazyJavaPackageFragment@8['lang'] {
     functions('bar': Name@16) = 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> = 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]
+    <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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
index 52d438d36b1..a45f5c2edab 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt307.lazy.log
@@ -42,3 +42,32 @@ LazyJavaPackageFragment@11['lang'] {
     functions('get': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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@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> = ArrayList@53[1] { ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[1] { ResolutionCandidate@54 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
index 67469a77548..95087345665 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt312.lazy.log
@@ -32,38 +32,105 @@ LazyJavaPackageFragment@3['<root>'] {
     classes('Int': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('args': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('safeGet': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('size': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Array': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('compareTo': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('get': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('safeGet': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('size': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('safeGet': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('size': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Array': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('safeGet': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('size': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('lang': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Array': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('args': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('compareTo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('get': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('safeGet': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    classes('size': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@43
-    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('Array': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('compareTo': Name@31) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('get': Name@32) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('safeGet': Name@33) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    functions('size': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@43
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@43
+    classes('Array': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('args': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('safeGet': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('size': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('Array': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('safeGet': Name@31) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('size': Name@32) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+}
+
+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]
+    <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 }
+    <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@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]
+    <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@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> = 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[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
+    <name not found> = ArrayList@88[7] { ResolutionCandidate@85, ResolutionCandidate@86, ResolutionCandidate@87, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
index 2539e0e364f..cd76908d61c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt313.lazy.log
@@ -115,3 +115,51 @@ LazyJavaPackageFragment@45['lang'] {
     functions('npe': Name@64) = EmptyList@66[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
 }
+
+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@66[empty]
+    <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@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+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]
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
index 80c9e52983c..0bf29aa2fa6 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt328.lazy.log
@@ -36,44 +36,154 @@ LazyJavaPackageFragment@10['<root>'] {
     classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('x': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('z': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar1': Name@29) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar2': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar3': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('block': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('f': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo3': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('x': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('z': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar1': Name@29) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar2': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('bar3': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('block': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('f': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('foo3': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@15['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@41
+    functions('lang': Name@42) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@41
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@17['lang'] {
-    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('bar3': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('invoke': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('x': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('z': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@38 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('bar1': Name@29) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('bar2': Name@30) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('bar3': Name@31) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('block': Name@32) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('f': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo3': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('invoke': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('bar1': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('bar2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('bar3': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('block': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('f': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('foo3': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('x': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    classes('z': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('bar1': Name@29) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('bar2': Name@30) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('bar3': Name@31) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('block': Name@32) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('f': Name@33) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('foo3': Name@34) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@45 // through LazyPackageFragmentScopeForJavaPackage@44
+}
+
+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]
+    <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]
+    <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]
+    <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@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@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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@87 {
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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 6f7f6a3db9f..d0763ef0e24 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt334.lazy.log
@@ -108,9 +108,19 @@ LazyJavaTypeParameterResolver@85 {
 }
 
 LazyJavaTypeParameterResolver@87 {
-    resolve(JavaTypeParameterImpl@39['T']) = null
+    resolve(JavaTypeParameterImpl@44['T']) = null
 }
 
 LazyJavaTypeParameterResolver@88 {
-    resolve(JavaTypeParameterImpl@44['T']) = null
+    resolve(JavaTypeParameterImpl@39['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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
index 7222fb12daa..bb569f07720 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt335.336.lazy.log
@@ -150,42 +150,42 @@ LazyJavaClassifierType@100['E'] {
     arguments = ArrayList@101[empty]
     classifier = JavaTypeParameterImpl@102['E']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@103['E'] {
     arguments = ArrayList@104[empty]
     classifier = JavaTypeParameterImpl@105['E']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@106['E'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaTypeParameterImpl@105['E']
+    classifier = JavaTypeParameterImpl@94['E']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaClassifierType@108['E'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaTypeParameterImpl@94['E']
+    classifier = JavaTypeParameterImpl@105['E']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@110['E'] {
     arguments = ArrayList@111[empty]
-    classifier = JavaTypeParameterImpl@98['E']
+    classifier = JavaTypeParameterImpl@102['E']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@112['E'] {
     arguments = ArrayList@113[empty]
-    classifier = JavaTypeParameterImpl@102['E']
+    classifier = JavaTypeParameterImpl@98['E']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 LazyJavaClassifierType@40['List<E>'] {
@@ -217,7 +217,7 @@ LazyJavaClassifierType@124['List<T>'] {
 
 LazyJavaClassifierType@129['List<T>'] {
     arguments = ArrayList@130[1] { TypeProjectionImpl@131 }
-    classifier = JavaClassImpl@127['List']
+    classifier = JavaClassImpl@122['List']
     memberScope = SubstitutingScope@132
     nullable = 'true': Boolean@70
     typeConstructor = DeserializedClassTypeConstructor@133
@@ -225,7 +225,7 @@ LazyJavaClassifierType@129['List<T>'] {
 
 LazyJavaClassifierType@134['List<T>'] {
     arguments = ArrayList@135[1] { TypeProjectionImpl@136 }
-    classifier = JavaClassImpl@122['List']
+    classifier = JavaClassImpl@127['List']
     memberScope = SubstitutingScope@137
     nullable = 'true': Boolean@70
     typeConstructor = DeserializedClassTypeConstructor@133
@@ -274,126 +274,126 @@ LazyJavaClassifierType@156['T'] {
     arguments = ArrayList@157[empty]
     classifier = JavaTypeParameterImpl@158['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@159['T'] {
     arguments = ArrayList@160[empty]
     classifier = JavaTypeParameterImpl@161['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
-LazyJavaClassifierType@163['T'] {
-    arguments = ArrayList@164[empty]
-    classifier = JavaTypeParameterImpl@165['T']
+LazyJavaClassifierType@162['T'] {
+    arguments = ArrayList@163[empty]
+    classifier = JavaTypeParameterImpl@164['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaClassifierType@166['T'] {
     arguments = ArrayList@167[empty]
     classifier = JavaTypeParameterImpl@168['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@169['T'] {
     arguments = ArrayList@170[empty]
     classifier = JavaTypeParameterImpl@171['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@172['T'] {
     arguments = ArrayList@173[empty]
     classifier = JavaTypeParameterImpl@174['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaClassifierType@175['T'] {
     arguments = ArrayList@176[empty]
     classifier = JavaTypeParameterImpl@177['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaClassifierType@178['T'] {
     arguments = ArrayList@179[empty]
     classifier = JavaTypeParameterImpl@180['T']
     nullable = 'false': Boolean@64
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaClassifierType@181['T'] {
     arguments = ArrayList@182[empty]
+    classifier = JavaTypeParameterImpl@150['T']
+    nullable = 'true': Boolean@70
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+}
+
+LazyJavaClassifierType@183['T'] {
+    arguments = ArrayList@184[empty]
     classifier = JavaTypeParameterImpl@154['T']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
-LazyJavaClassifierType@183['T'] {
-    arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@177['T']
-    nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
-}
-
 LazyJavaClassifierType@185['T'] {
     arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@161['T']
+    classifier = JavaTypeParameterImpl@164['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaClassifierType@187['T'] {
     arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@158['T']
+    classifier = JavaTypeParameterImpl@174['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaClassifierType@189['T'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@165['T']
+    classifier = JavaTypeParameterImpl@161['T']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
 }
 
 LazyJavaClassifierType@191['T'] {
     arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@171['T']
+    classifier = JavaTypeParameterImpl@180['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaClassifierType@193['T'] {
     arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@150['T']
+    classifier = JavaTypeParameterImpl@171['T']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@195['T'] {
     arguments = ArrayList@196[empty]
-    classifier = JavaTypeParameterImpl@174['T']
+    classifier = JavaTypeParameterImpl@168['T']
     nullable = 'true': Boolean@70
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@197['T'] {
     arguments = ArrayList@198[empty]
-    classifier = JavaTypeParameterImpl@180['T']
+    classifier = JavaTypeParameterImpl@158['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
 }
 
 LazyJavaClassifierType@199['T'] {
     arguments = ArrayList@200[empty]
-    classifier = JavaTypeParameterImpl@168['T']
+    classifier = JavaTypeParameterImpl@177['T']
     nullable = 'true': Boolean@70
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
 }
 
 LazyJavaPackageFragmentProvider@201 {
@@ -477,42 +477,42 @@ LazyJavaPackageFragment@221['util'] {
 
 LazyJavaTypeParameterDescriptor@42['E'] {
     defaultType = JetTypeImpl@259['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
     upperBounds = LinkedHashSet@260[1] { NullableType@261 }
 }
 
 LazyJavaTypeParameterDescriptor@37['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@95
 }
 
 LazyJavaTypeParameterDescriptor@262['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@165
     upperBounds = LinkedHashSet@263[1] { DelegatingFlexibleType@264 }
     upperBoundsAsType = DelegatingFlexibleType@264
 }
 
 LazyJavaTypeParameterDescriptor@265['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@162
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
     upperBounds = LinkedHashSet@266[1] { NullableType@267 }
     upperBoundsAsType = NullableType@267
 }
 
 LazyJavaTypeParameterDescriptor@50['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@151
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@155
     upperBounds = LinkedHashSet@268[1] { NullableType@269 }
     upperBoundsAsType = NullableType@269
 }
 
 LazyJavaTypeParameterResolver@270 {
-    resolve(JavaTypeParameterImpl@271['E']) = LazyJavaTypeParameterDescriptor@42['E']
+    resolve(JavaTypeParameterImpl@94['E']) = LazyJavaTypeParameterDescriptor@37['E']
 }
 
-LazyJavaTypeParameterResolver@272 {
-    resolve(JavaTypeParameterImpl@98['E']) = LazyJavaTypeParameterDescriptor@37['E']
+LazyJavaTypeParameterResolver@271 {
+    resolve(JavaTypeParameterImpl@272['E']) = LazyJavaTypeParameterDescriptor@42['E']
 }
 
 LazyJavaTypeParameterResolver@273 {
-    resolve(JavaTypeParameterImpl@274['T']) = LazyJavaTypeParameterDescriptor@265['T']
+    resolve(JavaTypeParameterImpl@274['T']) = LazyJavaTypeParameterDescriptor@262['T']
 }
 
 LazyJavaTypeParameterResolver@275 {
@@ -520,9 +520,77 @@ LazyJavaTypeParameterResolver@275 {
 }
 
 LazyJavaTypeParameterResolver@277 {
-    resolve(JavaTypeParameterImpl@278['T']) = LazyJavaTypeParameterDescriptor@262['T']
+    resolve(JavaTypeParameterImpl@278['T']) = LazyJavaTypeParameterDescriptor@265['T']
 }
 
 LazyJavaTypeParameterResolver@279 {
-    resolve(JavaTypeParameterImpl@150['T']) = null
+    resolve(JavaTypeParameterImpl@161['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 }
+    <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 }
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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/kt337.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
index adace50345d..0be6a626c6c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt337.lazy.log
@@ -10,25 +10,40 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    classes('foo': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@12
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('A': Name@11) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    functions('foo': Name@13) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@12
-    memberIndex = computeMemberIndex$1@16 // through LazyPackageFragmentScopeForJavaPackage@12
+    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@12
+    functions('A': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@12
+    memberIndex = computeMemberIndex$1@15 // through LazyPackageFragmentScopeForJavaPackage@12
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@18
-    functions('lang': Name@19) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@18
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@18
+    classes('lang': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('lang': Name@18) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('foo': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@14 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('A': Name@11) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('foo': Name@13) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('A': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@20
+}
+
+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@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
index 227836de4b7..612bb5470b4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt352.lazy.log
@@ -42,3 +42,31 @@ LazyJavaPackageFragment@10['lang'] {
     functions('doSmth': Name@38) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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@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]
+    <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 }
+    <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/regressions/kt353.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
index b704ac9de2a..16f99e2a59c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt353.lazy.log
@@ -22,22 +22,88 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('Unit': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('gen': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('gen': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('gen': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('gen': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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@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> = 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@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 }
+}
+
+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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
index fe87be1927d..7c1eba5a383 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt3535.lazy.log
@@ -13,26 +13,38 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    classes('p': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('invoke': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('p': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@15
+    classes('p': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('p': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('p': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('invoke': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('p': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('p': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('p': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
index 10b5fce8df2..85bbc6e2289 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt3647.lazy.log
@@ -17,28 +17,77 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Test': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('init': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('Test': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('init': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('Test': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('init': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('Test': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('init': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('Test': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('init': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('Test': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('init': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Test': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('init': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
index e17926d07a2..3214ecaef71 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt3731.lazy.log
@@ -21,37 +21,111 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('Unit': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('bar': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('A': Name@19) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('bar': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('f': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('foo': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('invoke': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('A': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('foo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@20
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('bar': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('f': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('A': Name@19) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('bar': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('A': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('A': Name@19) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('f': Name@22) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('foo': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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@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]
+    <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 }
+    <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 d942569a65a..82cd7503e61 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt385.109.441.lazy.log
@@ -7,46 +7,40 @@ LazyAnnotationDescriptor@0 {
 LazyJavaClassDescriptor@4['Appendable'] {
     functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
-LazyJavaClassDescriptor@11['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
+LazyJavaClassDescriptor@10['AutoCloseable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@15['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
+LazyJavaClassDescriptor@14['Closeable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
 }
 
-LazyJavaClassDescriptor@19['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['FilterOutputStream']
+LazyJavaClassDescriptor@18['FilterOutputStream'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@23['OutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
-    memberIndex = computeMemberIndex$1@25 // through LazyJavaClassMemberScope@24
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@26['OutputStream']
+LazyJavaClassDescriptor@22['OutputStream'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
+    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
 }
 
-LazyJavaClassDescriptor@27['PrintStream'] {
-    defaultType = JetTypeImpl@28['PrintStream']
-    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@30
-    functions('println': Name@9) = ArrayList@31[10] { JavaMethodDescriptor@32['println'], JavaMethodDescriptor@33['println'], JavaMethodDescriptor@34['println'], ... } // through LazyJavaClassMemberScope@30
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@30
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@30
-    nestedClasses('println': Name@9) = null // through LazyJavaClassMemberScope@30
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@30
+LazyJavaClassDescriptor@26['PrintStream'] {
+    defaultType = JetTypeImpl@27['PrintStream']
+    enumEntryIndex = LinkedHashMap@28 // through LazyJavaClassMemberScope@29
+    functions('println': Name@30) = ArrayList@31[10] { JavaMethodDescriptor@32['println'], JavaMethodDescriptor@33['println'], JavaMethodDescriptor@34['println'], ... } // through LazyJavaClassMemberScope@29
+    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
+    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
+    nestedClasses('println': Name@30) = null // through LazyJavaClassMemberScope@29
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
 }
@@ -62,27 +56,27 @@ LazyJavaClassDescriptor@39['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@49['System']
 }
 
-LazyJavaClassTypeConstructor@10['Appendable'] {
+LazyJavaClassTypeConstructor@9['Appendable'] {
     parameters = ArrayList@50[empty]
     supertypes = ArrayList@51[1] { JetTypeImpl@52['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['AutoCloseable'] {
+LazyJavaClassTypeConstructor@13['AutoCloseable'] {
     parameters = ArrayList@53[empty]
     supertypes = ArrayList@54[1] { JetTypeImpl@52['Any'] }
 }
 
-LazyJavaClassTypeConstructor@18['Closeable'] {
+LazyJavaClassTypeConstructor@17['Closeable'] {
     parameters = ArrayList@55[empty]
     supertypes = ArrayList@56[1] { LazyJavaClassifierType@57['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@22['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@21['FilterOutputStream'] {
     parameters = ArrayList@58[empty]
     supertypes = ArrayList@59[1] { LazyJavaClassifierType@60['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@26['OutputStream'] {
+LazyJavaClassTypeConstructor@25['OutputStream'] {
     parameters = ArrayList@61[empty]
     supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['Closeable'] }
 }
@@ -100,35 +94,35 @@ LazyJavaClassifierType@67['Appendable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['Appendable']
     memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
 LazyJavaClassifierType@57['AutoCloseable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
 LazyJavaClassifierType@68['Closeable'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['Closeable']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
 }
 
 LazyJavaClassifierType@63['Closeable'] {
     arguments = ArrayList@76[empty]
     classifier = JavaClassImpl@77['Closeable']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['Closeable']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['Closeable']
 }
 
 LazyJavaClassifierType@66['FilterOutputStream'] {
     arguments = ArrayList@78[empty]
     classifier = JavaClassImpl@79['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['FilterOutputStream']
 }
 
 LazyJavaClassifierType@80['Flushable'] {
@@ -173,14 +167,14 @@ LazyJavaClassifierType@96['Object'] {
 LazyJavaClassifierType@60['OutputStream'] {
     arguments = ArrayList@98[empty]
     classifier = JavaClassImpl@99['OutputStream']
-    memberScope = LazyJavaClassMemberScope@24
-    typeConstructor = LazyJavaClassTypeConstructor@26['OutputStream']
+    memberScope = LazyJavaClassMemberScope@23
+    typeConstructor = LazyJavaClassTypeConstructor@25['OutputStream']
 }
 
 LazyJavaClassifierType@100['PrintStream'] {
     arguments = ArrayList@101[empty]
     classifier = JavaClassImpl@102['PrintStream']
-    memberScope = LazyJavaClassMemberScope@30
+    memberScope = LazyJavaClassMemberScope@29
     nullable = 'false': Boolean@85
     typeConstructor = LazyJavaClassTypeConstructor@38['PrintStream']
 }
@@ -256,12 +250,12 @@ LazyJavaPackageFragmentProvider@111 {
     packageFragments('kotlin.io': FqName@163) = null
     packageFragments('kotlin.jvm': FqName@164) = null
     topLevelClasses(JavaClassImpl@71['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@73['AutoCloseable']) = LazyJavaClassDescriptor@11['AutoCloseable']
-    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@15['Closeable']
-    topLevelClasses(JavaClassImpl@79['FilterOutputStream']) = LazyJavaClassDescriptor@19['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@73['AutoCloseable']) = LazyJavaClassDescriptor@10['AutoCloseable']
+    topLevelClasses(JavaClassImpl@75['Closeable']) = LazyJavaClassDescriptor@14['Closeable']
+    topLevelClasses(JavaClassImpl@79['FilterOutputStream']) = LazyJavaClassDescriptor@18['FilterOutputStream']
     topLevelClasses(JavaClassImpl@165['Iterator']) = LazyJavaClassDescriptor@166['Iterator']
-    topLevelClasses(JavaClassImpl@99['OutputStream']) = LazyJavaClassDescriptor@23['OutputStream']
-    topLevelClasses(JavaClassImpl@102['PrintStream']) = LazyJavaClassDescriptor@27['PrintStream']
+    topLevelClasses(JavaClassImpl@99['OutputStream']) = LazyJavaClassDescriptor@22['OutputStream']
+    topLevelClasses(JavaClassImpl@102['PrintStream']) = LazyJavaClassDescriptor@26['PrintStream']
     topLevelClasses(JavaClassImpl@167['System']) = LazyJavaClassDescriptor@39['System']
 }
 
@@ -279,105 +273,329 @@ LazyJavaPackageFragment@113['<root>'] {
     classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@169
     classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('inc': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('inline': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('invoke': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('iterator': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('java': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('next': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('operation': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    classes('run': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@169
-    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('inline': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('java': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('operation': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('println': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    classes('run': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@169
+    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@169
     functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
     functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('inc': Name@182) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('invoke': Name@184) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('iterator': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('java': Name@191) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('next': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('operation': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    functions('run': Name@189) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('iterator': Name@183) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('java': Name@190) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('next': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('operation': Name@186) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('println': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    functions('run': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@169
+    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@169
 }
 
 LazyJavaPackageFragment@125['java'] {
-    classes('lang': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    classes('util': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('lang': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('util': Name@197) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('lang': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@193
+    classes('util': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@193
+    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('lang': Name@195) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    functions('util': Name@196) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@193
+    memberIndex = computeMemberIndex$1@197 // through LazyPackageFragmentScopeForJavaPackage@193
 }
 
 LazyJavaPackageFragment@129['lang'] {
-    classes('System': Name@175) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('inc': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('invoke': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('iterator': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('next': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('operation': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('run': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('inc': Name@182) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('invoke': Name@184) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('iterator': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('next': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('operation': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('run': Name@189) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    memberIndex = computeMemberIndex$1@200 // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('System': Name@175) = LazyJavaClassDescriptor@39['System'] // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('operation': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('println': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    classes('run': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@198
+    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('iterator': Name@183) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('next': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('operation': Name@186) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('println': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    functions('run': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@198
+    memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@198
 }
 
 LazyJavaPackageFragment@141['util'] {
-    classes('Array': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Int': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Iterable': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Iterator': Name@172) = LazyJavaClassDescriptor@166['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Long': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('String': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('System': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('Unit': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('inc': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('inline': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('invoke': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('iterator': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('next': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('operation': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    classes('run': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@201
-    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('inc': Name@182) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('invoke': Name@184) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('iterator': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('next': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('operation': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    functions('run': Name@189) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@201
-    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('Array': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('Int': Name@170) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('Iterable': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('Iterator': Name@172) = LazyJavaClassDescriptor@166['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('Long': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('String': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('System': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('Unit': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('body': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('foreach': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('gen': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('generic_invoker': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('hasNext': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('inline': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('iterator': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('next': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('operation': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('println': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    classes('run': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@200
+    deserializedPackageScope = Empty@189 // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('body': Name@177) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('foreach': Name@178) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('gen': Name@179) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('generic_invoker': Name@180) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('hasNext': Name@181) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('iterator': Name@183) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('next': Name@185) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('operation': Name@186) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('println': Name@187) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    functions('run': Name@188) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@200
+    memberIndex = computeMemberIndex$1@201 // through LazyPackageFragmentScopeForJavaPackage@200
+}
+
+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@214 {
+    <name not found> = ArrayList@215[1] { ResolutionCandidate@216 }
+    <name not found> = ArrayList@217[1] { ResolutionCandidate@216 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <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]
+    <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]
+    <name not found> = EmptyList@6[empty]
+}
+
+ResolutionTaskHolder@250 {
+    <name not found> = ArrayList@251[1] { ResolutionCandidate@252 }
+    <name not found> = ArrayList@253[1] { ResolutionCandidate@252 }
+    <name not found> = EmptyList@6[empty]
+    <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@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@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@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@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@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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@332 {
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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 633e51a6c4c..b0bfb0ec44b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt394.lazy.log
@@ -31,3 +31,44 @@ LazyJavaPackageFragment@8['lang'] {
     functions('Y': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
index f31318e9da9..c3d28b03a2f 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt398.lazy.log
@@ -25,33 +25,73 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('Any': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('X': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('check': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('not': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('X': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('check': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('not': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('X': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['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@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('X': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('check': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('invoke': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('not': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('X': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('check': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('invoke': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('not': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('X': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
+    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
+    functions('X': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+}
+
+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]
+    <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 }
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+}
+
+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]
+}
+
+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 46167133a69..2e5554d3352 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt399.lazy.log
@@ -28,29 +28,59 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Function1': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('getSameTypeChecker': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('not': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('getSameTypeChecker': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('invoke': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('not': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('getSameTypeChecker': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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@11['lang'] {
-    classes('getSameTypeChecker': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('not': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('getSameTypeChecker': Name@30) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('not': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('getSameTypeChecker': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('getSameTypeChecker': Name@30) = 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@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]
+    <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@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/regressions/kt402.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
index f6b2ba0e162..52011ef64e8 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt402.lazy.log
@@ -34,3 +34,13 @@ LazyJavaPackageFragment@8['java'] {
 LazyJavaPackageFragment@10['lang'] {
     classes('T': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
index 7f847171ca7..046a5ff095d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt41.lazy.log
@@ -27,3 +27,45 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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/regressions/kt411.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
index 2fac12290c1..ce6e0bd3aae 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt411.lazy.log
@@ -29,3 +29,44 @@ LazyJavaPackageFragment@8['lang'] {
     functions('invoker': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+    <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 }
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
index 357887a13e5..a70ebca4f2c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt439.lazy.log
@@ -30,29 +30,51 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('body': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('inline': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('run1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('body': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('invoke': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('run1': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('run1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('body': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('run1': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@12['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    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
 }
 
 LazyJavaPackageFragment@14['lang'] {
-    classes('body': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('run1': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('body': Name@29) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('run1': Name@32) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('body': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('run1': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('body': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('run1': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
index 80521ea8fbc..c572623dc27 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt442.lazy.log
@@ -74,3 +74,100 @@ LazyJavaPackageFragment@11['lang'] {
     functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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> = 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 }
+    <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@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]
+    <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]
+    <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]
+}
+
+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@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@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 }
+}
+
+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, ... }
+    <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 58fedf1d5a7..517c5fd0038 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt443.lazy.log
@@ -22,23 +22,59 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('plus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('plus': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('a': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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@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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
+
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
index d6df151a13c..1e624fc2503 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt455.lazy.log
@@ -25,3 +25,31 @@ LazyJavaPackageFragment@7['lang'] {
     functions('doSmth': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <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@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
index 53a3bfbca92..583589e251c 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt456.lazy.log
@@ -28,3 +28,45 @@ LazyJavaPackageFragment@7['lang'] {
     functions('doSmth': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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/kt459.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
index 49f2a188afb..0c58232e616 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt459.lazy.log
@@ -65,28 +65,28 @@ 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
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-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@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
-LazyJavaClassifierType@59['K'] {
-    arguments = ArrayList@60[empty]
-    classifier = JavaTypeParameterImpl@61['K']
+LazyJavaClassifierType@60['K'] {
+    arguments = ArrayList@61[empty]
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@63['K'] {
@@ -98,30 +98,30 @@ LazyJavaClassifierType@63['K'] {
 
 LazyJavaClassifierType@66['K'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@52['K']
+    classifier = JavaTypeParameterImpl@62['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@68['K'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@61['K']
+    classifier = JavaTypeParameterImpl@59['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@70['K'] {
     arguments = ArrayList@71[empty]
-    classifier = JavaTypeParameterImpl@55['K']
+    classifier = JavaTypeParameterImpl@52['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@72['K'] {
     arguments = ArrayList@73[empty]
-    classifier = JavaTypeParameterImpl@58['K']
+    classifier = JavaTypeParameterImpl@56['K']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
 }
 
 LazyJavaClassifierType@74['Map<? extends K, ? extends V>'] {
@@ -189,56 +189,56 @@ LazyJavaClassifierType@112['V'] {
     arguments = ArrayList@113[empty]
     classifier = JavaTypeParameterImpl@114['V']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
 }
 
-LazyJavaClassifierType@115['V'] {
-    arguments = ArrayList@116[empty]
-    classifier = JavaTypeParameterImpl@117['V']
+LazyJavaClassifierType@116['V'] {
+    arguments = ArrayList@117[empty]
+    classifier = JavaTypeParameterImpl@118['V']
     nullable = 'false': Boolean@48
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
-LazyJavaClassifierType@118['V'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaTypeParameterImpl@120['V']
+LazyJavaClassifierType@119['V'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaTypeParameterImpl@121['V']
     nullable = 'false': Boolean@48
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@122['V'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@107['V']
+    classifier = JavaTypeParameterImpl@121['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
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
 }
 
 LazyJavaClassifierType@126['V'] {
     arguments = ArrayList@127[empty]
-    classifier = JavaTypeParameterImpl@111['V']
+    classifier = JavaTypeParameterImpl@118['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@128['V'] {
     arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@114['V']
+    classifier = JavaTypeParameterImpl@107['V']
     nullable = 'true': Boolean@65
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaClassifierType@130['V'] {
     arguments = ArrayList@131[empty]
-    classifier = JavaTypeParameterImpl@120['V']
+    classifier = JavaTypeParameterImpl@111['V']
     nullable = 'true': Boolean@65
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@108
 }
 
 LazyJavaPackageFragmentProvider@132 {
@@ -303,12 +303,12 @@ LazyJavaPackageFragment@150['util'] {
 
 LazyJavaTypeParameterDescriptor@27['K'] {
     defaultType = JetTypeImpl@177['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
     upperBounds = LinkedHashSet@178[1] { NullableType@179 }
 }
 
 LazyJavaTypeParameterDescriptor@22['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 LazyJavaTypeParameterDescriptor@28['V'] {
@@ -318,15 +318,64 @@ LazyJavaTypeParameterDescriptor@28['V'] {
 }
 
 LazyJavaTypeParameterDescriptor@23['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@115
 }
 
 LazyJavaTypeParameterResolver@183 {
-    resolve(JavaTypeParameterImpl@184['K']) = LazyJavaTypeParameterDescriptor@22['K']
-    resolve(JavaTypeParameterImpl@185['V']) = LazyJavaTypeParameterDescriptor@23['V']
+    resolve(JavaTypeParameterImpl@184['K']) = LazyJavaTypeParameterDescriptor@27['K']
+    resolve(JavaTypeParameterImpl@185['V']) = LazyJavaTypeParameterDescriptor@28['V']
 }
 
 LazyJavaTypeParameterResolver@186 {
-    resolve(JavaTypeParameterImpl@187['K']) = LazyJavaTypeParameterDescriptor@27['K']
-    resolve(JavaTypeParameterImpl@188['V']) = LazyJavaTypeParameterDescriptor@28['V']
+    resolve(JavaTypeParameterImpl@187['K']) = LazyJavaTypeParameterDescriptor@22['K']
+    resolve(JavaTypeParameterImpl@188['V']) = LazyJavaTypeParameterDescriptor@23['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@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]
+    <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]
+    <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@204 {
+    <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/kt469.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
index b881f108755..1bd312f9620 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt469.lazy.log
@@ -1,46 +1,40 @@
 LazyJavaClassDescriptor@0['Appendable'] {
     functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
-LazyJavaClassDescriptor@7['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+LazyJavaClassDescriptor@6['AutoCloseable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@11['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+LazyJavaClassDescriptor@10['Closeable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassDescriptor@15['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+LazyJavaClassDescriptor@14['FilterOutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@19['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
+LazyJavaClassDescriptor@18['OutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@19
+    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
 }
 
-LazyJavaClassDescriptor@23['PrintStream'] {
-    defaultType = JetTypeImpl@24['PrintStream']
-    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@26
-    functions('println': Name@5) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@26
-    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@26
-    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@26
-    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@26
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
+LazyJavaClassDescriptor@22['PrintStream'] {
+    defaultType = JetTypeImpl@23['PrintStream']
+    enumEntryIndex = LinkedHashMap@24 // through LazyJavaClassMemberScope@25
+    functions('println': Name@26) = ArrayList@27[10] { JavaMethodDescriptor@28['println'], JavaMethodDescriptor@29['println'], JavaMethodDescriptor@30['println'], ... } // through LazyJavaClassMemberScope@25
+    memberIndex = computeMemberIndex$1@31 // through LazyJavaClassMemberScope@25
+    nestedClassIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@25
+    nestedClasses('println': Name@26) = null // through LazyJavaClassMemberScope@25
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@33['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
@@ -56,27 +50,27 @@ LazyJavaClassDescriptor@35['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@45['System']
 }
 
-LazyJavaClassTypeConstructor@6['Appendable'] {
+LazyJavaClassTypeConstructor@5['Appendable'] {
     parameters = ArrayList@46[empty]
     supertypes = ArrayList@47[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+LazyJavaClassTypeConstructor@9['AutoCloseable'] {
     parameters = ArrayList@49[empty]
     supertypes = ArrayList@50[1] { JetTypeImpl@48['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['Closeable'] {
+LazyJavaClassTypeConstructor@13['Closeable'] {
     parameters = ArrayList@51[empty]
     supertypes = ArrayList@52[1] { LazyJavaClassifierType@53['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@18['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
     parameters = ArrayList@54[empty]
     supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@22['OutputStream'] {
+LazyJavaClassTypeConstructor@21['OutputStream'] {
     parameters = ArrayList@57[empty]
     supertypes = ArrayList@58[1] { LazyJavaClassifierType@59['Closeable'] }
 }
@@ -94,35 +88,35 @@ LazyJavaClassifierType@63['Appendable'] {
     arguments = ArrayList@66[empty]
     classifier = JavaClassImpl@67['Appendable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
 LazyJavaClassifierType@53['AutoCloseable'] {
     arguments = ArrayList@68[empty]
     classifier = JavaClassImpl@69['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
 LazyJavaClassifierType@59['Closeable'] {
     arguments = ArrayList@70[empty]
     classifier = JavaClassImpl@71['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@64['Closeable'] {
     arguments = ArrayList@72[empty]
     classifier = JavaClassImpl@73['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@62['FilterOutputStream'] {
     arguments = ArrayList@74[empty]
     classifier = JavaClassImpl@75['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
 LazyJavaClassifierType@76['Flushable'] {
@@ -167,14 +161,14 @@ LazyJavaClassifierType@92['Object'] {
 LazyJavaClassifierType@56['OutputStream'] {
     arguments = ArrayList@94[empty]
     classifier = JavaClassImpl@95['OutputStream']
-    memberScope = LazyJavaClassMemberScope@20
-    typeConstructor = LazyJavaClassTypeConstructor@22['OutputStream']
+    memberScope = LazyJavaClassMemberScope@19
+    typeConstructor = LazyJavaClassTypeConstructor@21['OutputStream']
 }
 
 LazyJavaClassifierType@96['PrintStream'] {
     arguments = ArrayList@97[empty]
     classifier = JavaClassImpl@98['PrintStream']
-    memberScope = LazyJavaClassMemberScope@26
+    memberScope = LazyJavaClassMemberScope@25
     nullable = 'false': Boolean@81
     typeConstructor = LazyJavaClassTypeConstructor@34['PrintStream']
 }
@@ -236,11 +230,11 @@ LazyJavaPackageFragmentProvider@107 {
     packageFragments('kt469.System': FqName@145) = null
     packageFragments('kt469.T': FqName@146) = null
     topLevelClasses(JavaClassImpl@67['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@73['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
-    topLevelClasses(JavaClassImpl@75['FilterOutputStream']) = LazyJavaClassDescriptor@15['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@95['OutputStream']) = LazyJavaClassDescriptor@19['OutputStream']
-    topLevelClasses(JavaClassImpl@98['PrintStream']) = LazyJavaClassDescriptor@23['PrintStream']
+    topLevelClasses(JavaClassImpl@69['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
+    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']
     topLevelClasses(JavaClassImpl@147['System']) = LazyJavaClassDescriptor@35['System']
 }
 
@@ -257,58 +251,304 @@ LazyJavaPackageFragment@120['lang'] {
     classes('MyNumber': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@156
     classes('System': Name@157) = LazyJavaClassDescriptor@35['System'] // through LazyPackageFragmentScopeForJavaPackage@156
     classes('add': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('hasNext': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('i': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('iterator': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('minus': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('minusAssign': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('next': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('plus': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('plusAssign': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('rangeTo': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@156
+    classes('i': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@156
+    classes('minus': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@156
+    classes('minusAssign': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@156
+    classes('plus': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@156
+    classes('plusAssign': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@156
     deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@156
     functions('MyNumber': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
     functions('add': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('hasNext': Name@159) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('iterator': Name@161) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('minus': Name@162) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('minusAssign': Name@163) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('next': Name@164) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('plus': Name@165) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('plusAssign': Name@166) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('rangeTo': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@156
+    functions('minus': Name@160) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
+    functions('minusAssign': Name@161) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
+    functions('plus': Name@162) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
+    functions('plusAssign': Name@163) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@156
+    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@156
 }
 
 LazyJavaPackageFragment@127['util'] {
-    classes('Int': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('MutableList': Name@171) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('MyNumber': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('System': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('add': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('hasNext': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('i': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('iterator': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('minus': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('minusAssign': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('next': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('plus': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('plusAssign': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    classes('rangeTo': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('MyNumber': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('add': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('hasNext': Name@159) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('iterator': Name@161) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('minus': Name@162) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('minusAssign': Name@163) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('next': Name@164) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('plus': Name@165) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('plusAssign': Name@166) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('rangeTo': Name@167) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('Int': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('MutableList': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('MyNumber': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('System': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('add': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('i': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('minus': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('minusAssign': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('plus': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    classes('plusAssign': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@166
+    deserializedPackageScope = Empty@151 // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('MyNumber': Name@155) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('add': Name@158) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('minus': Name@160) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('minusAssign': Name@161) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('plus': Name@162) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    functions('plusAssign': Name@163) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@166
+    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@166
+}
+
+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]
+    <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@179 {
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@181 }
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@181 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@2[empty]
+    <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@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[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[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[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]
+    <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@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]
+    <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@278 {
+    <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 69ccd686b1c..d2d45982abe 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt4827.lazy.log
@@ -33,3 +33,88 @@ LazyJavaPackageFragment@8['lang'] {
     functions('TestInterface': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <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> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 {
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 d41f74de6af..ac5fed202b7 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt498.lazy.log
@@ -58,7 +58,6 @@ LazyJavaClassDescriptor@62['Object'] {
     memberIndex = computeMemberIndex$1@69 // through LazyJavaClassMemberScope@65
     nestedClassIndex = LinkedHashMap@70 // through LazyJavaClassMemberScope@65
     nestedClasses('getClass': Name@66) = null // through LazyJavaClassMemberScope@65
-    properties('getClass': Name@66) = EmptyList@18[empty] // through LazyJavaClassMemberScope@65
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@71['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@72['Object']
 }
@@ -186,14 +185,14 @@ LazyJavaClassifierType@127['String'] {
 
 LazyJavaClassifierType@129['String'] {
     arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@126['String']
+    classifier = JavaClassImpl@123['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@120
 }
 
 LazyJavaClassifierType@131['String'] {
     arguments = ArrayList@132[empty]
-    classifier = JavaClassImpl@123['String']
+    classifier = JavaClassImpl@126['String']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@120
 }
@@ -229,21 +228,21 @@ LazyJavaClassifierType@143['Throwable'] {
 
 LazyJavaClassifierType@146['Throwable'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@142['Throwable']
+    classifier = JavaClassImpl@139['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@148['Throwable'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@145['Throwable']
+    classifier = JavaClassImpl@142['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@136
 }
 
 LazyJavaClassifierType@150['Throwable'] {
     arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@139['Throwable']
+    classifier = JavaClassImpl@145['Throwable']
     nullable = 'true': Boolean@103
     typeConstructor = DeserializedClassTypeConstructor@136
 }
@@ -292,36 +291,38 @@ LazyJavaPackageFragment@155['<root>'] {
     classes('Class': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@187
     classes('Exception': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@187
     classes('Object': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    classes('getClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@187
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@187
-    functions('getClass': Name@66) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@187
-    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@187
 }
 
 LazyJavaPackageFragment@163['java'] {
-    classes('lang': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@194
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@194
-    functions('lang': Name@195) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@194
-    memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@194
+    classes('lang': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@192
+    deserializedPackageScope = Empty@193 // through LazyPackageFragmentScopeForJavaPackage@192
+    functions('lang': Name@194) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@192
+    memberIndex = computeMemberIndex$1@195 // through LazyPackageFragmentScopeForJavaPackage@192
 }
 
 LazyJavaPackageFragment@167['lang'] {
-    classes('Class': Name@188) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('Exception': Name@189) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('Object': Name@190) = LazyJavaClassDescriptor@62['Object'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('getClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('getClass': Name@66) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('Class': Name@188) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@196
+    classes('Exception': Name@189) = LazyJavaClassDescriptor@5['Exception'] // through LazyPackageFragmentScopeForJavaPackage@196
+    classes('Object': Name@190) = LazyJavaClassDescriptor@62['Object'] // through LazyPackageFragmentScopeForJavaPackage@196
 }
 
 LazyJavaTypeParameterDescriptor@80['T'] {
-    defaultType = JetTypeImpl@199['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@200
-    upperBounds = LinkedHashSet@201[1] { NullableType@202 }
-    upperBoundsAsType = NullableType@202
+    defaultType = JetTypeImpl@197['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@198
+    upperBounds = LinkedHashSet@199[1] { NullableType@200 }
+    upperBoundsAsType = NullableType@200
 }
 
-LazyJavaTypeParameterResolver@203 {
-    resolve(JavaTypeParameterImpl@204['T']) = LazyJavaTypeParameterDescriptor@80['T']
+LazyJavaTypeParameterResolver@201 {
+    resolve(JavaTypeParameterImpl@202['T']) = LazyJavaTypeParameterDescriptor@80['T']
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
index df48cf67995..959928bba76 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt524.lazy.log
@@ -3,904 +3,975 @@ LazyJavaClassDescriptor@0['AbstractStringBuilder'] {
     functions('append': Name@2) = ArrayList@3[13] { JavaMethodDescriptor@4['append'], JavaMethodDescriptor@5['append'], JavaMethodDescriptor@6['append'], ... } // through LazyJavaClassMemberScope@7
     functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@7
-    properties('append': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    properties('other': Name@12) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
     properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@7
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassDescriptor@15['Appendable'] {
-    defaultType = JetTypeImpl@16['Appendable']
-    functions('append': Name@17) = ArrayList@18[3] { JavaMethodDescriptor@19['append'], JavaMethodDescriptor@20['append'], JavaMethodDescriptor@21['append'] } // through LazyJavaClassMemberScope@22
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@22
-    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
-    properties('append': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@22
-    properties('other': Name@12) = EmptyList@9[empty] // through LazyJavaClassMemberScope@22
-    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@22
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassDescriptor@13['Appendable'] {
+    defaultType = JetTypeImpl@14['Appendable']
+    functions('append': Name@15) = ArrayList@16[3] { JavaMethodDescriptor@17['append'], JavaMethodDescriptor@18['append'], JavaMethodDescriptor@19['append'] } // through LazyJavaClassMemberScope@20
+    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
+    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@20
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassDescriptor@26['Exception'] {
-    typeConstructor = LazyJavaClassTypeConstructor@27['Exception']
+LazyJavaClassDescriptor@24['Exception'] {
+    typeConstructor = LazyJavaClassTypeConstructor@25['Exception']
 }
 
-LazyJavaClassDescriptor@28['NullPointerException'] {
-    constructors = ArrayList@29[2] { JavaConstructorDescriptor@30['<init>'], JavaConstructorDescriptor@31['<init>'] } // through LazyJavaClassMemberScope@32
-    defaultType = JetTypeImpl@33['NullPointerException']
+LazyJavaClassDescriptor@26['NullPointerException'] {
+    constructors = ArrayList@27[2] { JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'] } // through LazyJavaClassMemberScope@30
+    defaultType = JetTypeImpl@31['NullPointerException']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@34['NullPointerException']
+    typeConstructor = LazyJavaClassTypeConstructor@32['NullPointerException']
 }
 
-LazyJavaClassDescriptor@35['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@36['RuntimeException']
+LazyJavaClassDescriptor@33['RuntimeException'] {
+    typeConstructor = LazyJavaClassTypeConstructor@34['RuntimeException']
 }
 
-LazyJavaClassDescriptor@37['Serializable'] {
-    functions('append': Name@2) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@38
-    properties('append': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    properties('other': Name@12) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@38
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+LazyJavaClassDescriptor@35['Serializable'] {
+    functions('append': Name@2) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
+    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
+    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
+    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@36
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
-LazyJavaClassDescriptor@41['StringBuffer'] {
+LazyJavaClassDescriptor@39['StringBuffer'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassDescriptor@43['StringBuilder'] {
-    constructors = ArrayList@44[4] { JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], ... } // through LazyJavaClassMemberScope@48
-    defaultType = JetTypeImpl@49['StringBuilder']
-    enumEntryIndex = LinkedHashMap@50 // through LazyJavaClassMemberScope@48
+LazyJavaClassDescriptor@41['StringBuilder'] {
+    constructors = ArrayList@42[4] { JavaConstructorDescriptor@43['<init>'], JavaConstructorDescriptor@44['<init>'], JavaConstructorDescriptor@45['<init>'], ... } // through LazyJavaClassMemberScope@46
+    defaultType = JetTypeImpl@47['StringBuilder']
+    enumEntryIndex = LinkedHashMap@48 // through LazyJavaClassMemberScope@46
     functionTypeForSamInterface = null
-    functions('append': Name@11) = ArrayList@51[14] { JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], JavaMethodDescriptor@54['append'], ... } // through LazyJavaClassMemberScope@48
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@48
-    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@48
-    nestedClassIndex = LinkedHashMap@56 // through LazyJavaClassMemberScope@48
-    nestedClasses('append': Name@11) = null // through LazyJavaClassMemberScope@48
-    nestedClasses('other': Name@12) = null // through LazyJavaClassMemberScope@48
-    nestedClasses('sure1': Name@8) = null // through LazyJavaClassMemberScope@48
-    properties('append': Name@11) = EmptyList@9[empty] // through LazyJavaClassMemberScope@48
-    properties('other': Name@12) = EmptyList@9[empty] // through LazyJavaClassMemberScope@48
-    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@48
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@57['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+    functions('append': Name@49) = ArrayList@50[14] { JavaMethodDescriptor@51['append'], JavaMethodDescriptor@52['append'], JavaMethodDescriptor@53['append'], ... } // through LazyJavaClassMemberScope@46
+    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@46
+    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@46
+    nestedClassIndex = LinkedHashMap@55 // through LazyJavaClassMemberScope@46
+    nestedClasses('append': Name@49) = null // through LazyJavaClassMemberScope@46
+    nestedClasses('sure1': Name@8) = null // through LazyJavaClassMemberScope@46
+    properties('sure1': Name@8) = EmptyList@9[empty] // through LazyJavaClassMemberScope@46
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@56['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassTypeConstructor@14['AbstractStringBuilder'] {
-    parameters = ArrayList@59[empty]
-    supertypes = ArrayList@60[2] { LazyJavaClassifierType@61['Appendable'], LazyJavaClassifierType@62['CharSequence'] }
+LazyJavaClassTypeConstructor@12['AbstractStringBuilder'] {
+    parameters = ArrayList@58[empty]
+    supertypes = ArrayList@59[2] { LazyJavaClassifierType@60['Appendable'], LazyJavaClassifierType@61['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@25['Appendable'] {
-    parameters = ArrayList@63[empty]
-    supertypes = ArrayList@64[1] { JetTypeImpl@65['Any'] }
+LazyJavaClassTypeConstructor@23['Appendable'] {
+    parameters = ArrayList@62[empty]
+    supertypes = ArrayList@63[1] { JetTypeImpl@64['Any'] }
 }
 
-LazyJavaClassTypeConstructor@27['Exception'] {
-    parameters = ArrayList@66[empty]
-    supertypes = ArrayList@67[1] { LazyJavaClassifierType@68['Throwable'] }
+LazyJavaClassTypeConstructor@25['Exception'] {
+    parameters = ArrayList@65[empty]
+    supertypes = ArrayList@66[1] { LazyJavaClassifierType@67['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@34['NullPointerException'] {
-    parameters = ArrayList@69[empty]
-    supertypes = ArrayList@70[1] { LazyJavaClassifierType@71['RuntimeException'] }
+LazyJavaClassTypeConstructor@32['NullPointerException'] {
+    parameters = ArrayList@68[empty]
+    supertypes = ArrayList@69[1] { LazyJavaClassifierType@70['RuntimeException'] }
 }
 
-LazyJavaClassTypeConstructor@36['RuntimeException'] {
-    parameters = ArrayList@72[empty]
-    supertypes = ArrayList@73[1] { LazyJavaClassifierType@74['Exception'] }
+LazyJavaClassTypeConstructor@34['RuntimeException'] {
+    parameters = ArrayList@71[empty]
+    supertypes = ArrayList@72[1] { LazyJavaClassifierType@73['Exception'] }
 }
 
-LazyJavaClassTypeConstructor@40['Serializable'] {
-    parameters = ArrayList@75[empty]
-    supertypes = ArrayList@76[1] { JetTypeImpl@65['Any'] }
+LazyJavaClassTypeConstructor@38['Serializable'] {
+    parameters = ArrayList@74[empty]
+    supertypes = ArrayList@75[1] { JetTypeImpl@64['Any'] }
 }
 
-LazyJavaClassTypeConstructor@42['StringBuffer'] {
-    parameters = ArrayList@77[empty]
-    supertypes = ArrayList@78[3] { LazyJavaClassifierType@79['AbstractStringBuilder'], LazyJavaClassifierType@80['Serializable'], LazyJavaClassifierType@81['CharSequence'] }
+LazyJavaClassTypeConstructor@40['StringBuffer'] {
+    parameters = ArrayList@76[empty]
+    supertypes = ArrayList@77[3] { LazyJavaClassifierType@78['AbstractStringBuilder'], LazyJavaClassifierType@79['Serializable'], LazyJavaClassifierType@80['CharSequence'] }
 }
 
-LazyJavaClassTypeConstructor@58['StringBuilder'] {
-    parameters = ArrayList@82[empty]
-    supertypes = ArrayList@83[3] { LazyJavaClassifierType@84['AbstractStringBuilder'], LazyJavaClassifierType@85['Serializable'], LazyJavaClassifierType@86['CharSequence'] }
+LazyJavaClassTypeConstructor@57['StringBuilder'] {
+    parameters = ArrayList@81[empty]
+    supertypes = ArrayList@82[3] { LazyJavaClassifierType@83['AbstractStringBuilder'], LazyJavaClassifierType@84['Serializable'], LazyJavaClassifierType@85['CharSequence'] }
 }
 
-LazyJavaClassifierType@84['AbstractStringBuilder'] {
-    arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@88['AbstractStringBuilder']
+LazyJavaClassifierType@83['AbstractStringBuilder'] {
+    arguments = ArrayList@86[empty]
+    classifier = JavaClassImpl@87['AbstractStringBuilder']
     memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@89['AbstractStringBuilder'] {
-    arguments = ArrayList@90[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@88['AbstractStringBuilder'] {
+    arguments = ArrayList@89[empty]
+    classifier = JavaClassImpl@90['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@93['AbstractStringBuilder'] {
-    arguments = ArrayList@94[empty]
-    classifier = JavaClassImpl@95['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@92['AbstractStringBuilder'] {
+    arguments = ArrayList@93[empty]
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@96['AbstractStringBuilder'] {
-    arguments = ArrayList@97[empty]
-    classifier = JavaClassImpl@98['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@95['AbstractStringBuilder'] {
+    arguments = ArrayList@96[empty]
+    classifier = JavaClassImpl@97['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@99['AbstractStringBuilder'] {
-    arguments = ArrayList@100[empty]
-    classifier = JavaClassImpl@101['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@98['AbstractStringBuilder'] {
+    arguments = ArrayList@99[empty]
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@102['AbstractStringBuilder'] {
-    arguments = ArrayList@103[empty]
-    classifier = JavaClassImpl@104['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@101['AbstractStringBuilder'] {
+    arguments = ArrayList@102[empty]
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@105['AbstractStringBuilder'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@107['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@104['AbstractStringBuilder'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@108['AbstractStringBuilder'] {
-    arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@110['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@107['AbstractStringBuilder'] {
+    arguments = ArrayList@108[empty]
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@111['AbstractStringBuilder'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaClassImpl@113['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@110['AbstractStringBuilder'] {
+    arguments = ArrayList@111[empty]
+    classifier = JavaClassImpl@112['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@114['AbstractStringBuilder'] {
-    arguments = ArrayList@115[empty]
-    classifier = JavaClassImpl@116['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@113['AbstractStringBuilder'] {
+    arguments = ArrayList@114[empty]
+    classifier = JavaClassImpl@115['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@117['AbstractStringBuilder'] {
-    arguments = ArrayList@118[empty]
-    classifier = JavaClassImpl@119['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@116['AbstractStringBuilder'] {
+    arguments = ArrayList@117[empty]
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@120['AbstractStringBuilder'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@119['AbstractStringBuilder'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@123['AbstractStringBuilder'] {
-    arguments = ArrayList@124[empty]
-    classifier = JavaClassImpl@125['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@122['AbstractStringBuilder'] {
+    arguments = ArrayList@123[empty]
+    classifier = JavaClassImpl@124['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@126['AbstractStringBuilder'] {
-    arguments = ArrayList@127[empty]
-    classifier = JavaClassImpl@128['AbstractStringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@125['AbstractStringBuilder'] {
+    arguments = ArrayList@126[empty]
+    classifier = JavaClassImpl@127['AbstractStringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@129['AbstractStringBuilder'] {
-    arguments = ArrayList@130[empty]
-    classifier = JavaClassImpl@110['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@128['AbstractStringBuilder'] {
+    arguments = ArrayList@129[empty]
+    classifier = JavaClassImpl@124['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@132['AbstractStringBuilder'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@119['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@131['AbstractStringBuilder'] {
+    arguments = ArrayList@132[empty]
+    classifier = JavaClassImpl@97['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@134['AbstractStringBuilder'] {
-    arguments = ArrayList@135[empty]
-    classifier = JavaClassImpl@101['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@133['AbstractStringBuilder'] {
+    arguments = ArrayList@134[empty]
+    classifier = JavaClassImpl@94['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@136['AbstractStringBuilder'] {
-    arguments = ArrayList@137[empty]
-    classifier = JavaClassImpl@107['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@135['AbstractStringBuilder'] {
+    arguments = ArrayList@136[empty]
+    classifier = JavaClassImpl@90['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@138['AbstractStringBuilder'] {
-    arguments = ArrayList@139[empty]
-    classifier = JavaClassImpl@128['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@137['AbstractStringBuilder'] {
+    arguments = ArrayList@138[empty]
+    classifier = JavaClassImpl@106['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@140['AbstractStringBuilder'] {
-    arguments = ArrayList@141[empty]
-    classifier = JavaClassImpl@98['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@139['AbstractStringBuilder'] {
+    arguments = ArrayList@140[empty]
+    classifier = JavaClassImpl@112['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@142['AbstractStringBuilder'] {
-    arguments = ArrayList@143[empty]
-    classifier = JavaClassImpl@95['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@141['AbstractStringBuilder'] {
+    arguments = ArrayList@142[empty]
+    classifier = JavaClassImpl@118['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@144['AbstractStringBuilder'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaClassImpl@122['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@143['AbstractStringBuilder'] {
+    arguments = ArrayList@144[empty]
+    classifier = JavaClassImpl@109['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@146['AbstractStringBuilder'] {
-    arguments = ArrayList@147[empty]
-    classifier = JavaClassImpl@116['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@145['AbstractStringBuilder'] {
+    arguments = ArrayList@146[empty]
+    classifier = JavaClassImpl@100['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@148['AbstractStringBuilder'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaClassImpl@113['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@147['AbstractStringBuilder'] {
+    arguments = ArrayList@148[empty]
+    classifier = JavaClassImpl@103['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@150['AbstractStringBuilder'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaClassImpl@91['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@149['AbstractStringBuilder'] {
+    arguments = ArrayList@150[empty]
+    classifier = JavaClassImpl@127['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@152['AbstractStringBuilder'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaClassImpl@125['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@151['AbstractStringBuilder'] {
+    arguments = ArrayList@152[empty]
+    classifier = JavaClassImpl@115['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@154['AbstractStringBuilder'] {
+LazyJavaClassifierType@153['AbstractStringBuilder'] {
+    arguments = ArrayList@154[empty]
+    classifier = JavaClassImpl@121['AbstractStringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
+}
+
+LazyJavaClassifierType@78['AbstractStringBuilder'] {
     arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@104['AbstractStringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+    classifier = JavaClassImpl@156['AbstractStringBuilder']
+    typeConstructor = LazyJavaClassTypeConstructor@12['AbstractStringBuilder']
 }
 
-LazyJavaClassifierType@79['AbstractStringBuilder'] {
-    arguments = ArrayList@156[empty]
-    classifier = JavaClassImpl@157['AbstractStringBuilder']
-    typeConstructor = LazyJavaClassTypeConstructor@14['AbstractStringBuilder']
+LazyJavaClassifierType@60['Appendable'] {
+    arguments = ArrayList@157[empty]
+    classifier = JavaClassImpl@158['Appendable']
+    memberScope = LazyJavaClassMemberScope@20
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassifierType@61['Appendable'] {
-    arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@159['Appendable']
-    memberScope = LazyJavaClassMemberScope@22
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassifierType@159['Appendable'] {
+    arguments = ArrayList@160[empty]
+    classifier = JavaClassImpl@161['Appendable']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassifierType@160['Appendable'] {
-    arguments = ArrayList@161[empty]
-    classifier = JavaClassImpl@162['Appendable']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassifierType@162['Appendable'] {
+    arguments = ArrayList@163[empty]
+    classifier = JavaClassImpl@164['Appendable']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassifierType@163['Appendable'] {
-    arguments = ArrayList@164[empty]
-    classifier = JavaClassImpl@165['Appendable']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassifierType@165['Appendable'] {
+    arguments = ArrayList@166[empty]
+    classifier = JavaClassImpl@167['Appendable']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassifierType@166['Appendable'] {
-    arguments = ArrayList@167[empty]
-    classifier = JavaClassImpl@168['Appendable']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassifierType@168['Appendable'] {
+    arguments = ArrayList@169[empty]
+    classifier = JavaClassImpl@164['Appendable']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassifierType@169['Appendable'] {
-    arguments = ArrayList@170[empty]
-    classifier = JavaClassImpl@168['Appendable']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassifierType@170['Appendable'] {
+    arguments = ArrayList@171[empty]
+    classifier = JavaClassImpl@167['Appendable']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassifierType@171['Appendable'] {
-    arguments = ArrayList@172[empty]
-    classifier = JavaClassImpl@162['Appendable']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+LazyJavaClassifierType@172['Appendable'] {
+    arguments = ArrayList@173[empty]
+    classifier = JavaClassImpl@161['Appendable']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@23['Appendable']
 }
 
-LazyJavaClassifierType@173['Appendable'] {
+LazyJavaClassifierType@85['CharSequence'] {
     arguments = ArrayList@174[empty]
-    classifier = JavaClassImpl@165['Appendable']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@25['Appendable']
+    classifier = JavaClassImpl@175['CharSequence']
+    memberScope = DeserializedClassMemberScope@176
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@62['CharSequence'] {
-    arguments = ArrayList@175[empty]
-    classifier = JavaClassImpl@176['CharSequence']
-    memberScope = DeserializedClassMemberScope@177
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@61['CharSequence'] {
+    arguments = ArrayList@178[empty]
+    classifier = JavaClassImpl@179['CharSequence']
+    memberScope = DeserializedClassMemberScope@176
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@86['CharSequence'] {
-    arguments = ArrayList@179[empty]
-    classifier = JavaClassImpl@180['CharSequence']
-    memberScope = DeserializedClassMemberScope@177
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@180['CharSequence'] {
+    arguments = ArrayList@181[empty]
+    classifier = JavaClassImpl@182['CharSequence']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@181['CharSequence'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaClassImpl@183['CharSequence']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@183['CharSequence'] {
+    arguments = ArrayList@184[empty]
+    classifier = JavaClassImpl@185['CharSequence']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@184['CharSequence'] {
-    arguments = ArrayList@185[empty]
-    classifier = JavaClassImpl@186['CharSequence']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@186['CharSequence'] {
+    arguments = ArrayList@187[empty]
+    classifier = JavaClassImpl@188['CharSequence']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@187['CharSequence'] {
-    arguments = ArrayList@188[empty]
-    classifier = JavaClassImpl@189['CharSequence']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@189['CharSequence'] {
+    arguments = ArrayList@190[empty]
+    classifier = JavaClassImpl@191['CharSequence']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@190['CharSequence'] {
-    arguments = ArrayList@191[empty]
-    classifier = JavaClassImpl@192['CharSequence']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@192['CharSequence'] {
+    arguments = ArrayList@193[empty]
+    classifier = JavaClassImpl@194['CharSequence']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@193['CharSequence'] {
-    arguments = ArrayList@194[empty]
-    classifier = JavaClassImpl@195['CharSequence']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@195['CharSequence'] {
+    arguments = ArrayList@196[empty]
+    classifier = JavaClassImpl@197['CharSequence']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@196['CharSequence'] {
-    arguments = ArrayList@197[empty]
-    classifier = JavaClassImpl@198['CharSequence']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@198['CharSequence'] {
+    arguments = ArrayList@199[empty]
+    classifier = JavaClassImpl@200['CharSequence']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@199['CharSequence'] {
-    arguments = ArrayList@200[empty]
-    classifier = JavaClassImpl@201['CharSequence']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@201['CharSequence'] {
+    arguments = ArrayList@202[empty]
+    classifier = JavaClassImpl@185['CharSequence']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@202['CharSequence'] {
-    arguments = ArrayList@203[empty]
-    classifier = JavaClassImpl@192['CharSequence']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@203['CharSequence'] {
+    arguments = ArrayList@204[empty]
+    classifier = JavaClassImpl@182['CharSequence']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@204['CharSequence'] {
-    arguments = ArrayList@205[empty]
-    classifier = JavaClassImpl@186['CharSequence']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@205['CharSequence'] {
+    arguments = ArrayList@206[empty]
+    classifier = JavaClassImpl@200['CharSequence']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@206['CharSequence'] {
-    arguments = ArrayList@207[empty]
-    classifier = JavaClassImpl@189['CharSequence']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@207['CharSequence'] {
+    arguments = ArrayList@208[empty]
+    classifier = JavaClassImpl@194['CharSequence']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@208['CharSequence'] {
-    arguments = ArrayList@209[empty]
-    classifier = JavaClassImpl@201['CharSequence']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@209['CharSequence'] {
+    arguments = ArrayList@210[empty]
+    classifier = JavaClassImpl@197['CharSequence']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@210['CharSequence'] {
-    arguments = ArrayList@211[empty]
-    classifier = JavaClassImpl@198['CharSequence']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@211['CharSequence'] {
+    arguments = ArrayList@212[empty]
+    classifier = JavaClassImpl@188['CharSequence']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@212['CharSequence'] {
-    arguments = ArrayList@213[empty]
-    classifier = JavaClassImpl@195['CharSequence']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@213['CharSequence'] {
+    arguments = ArrayList@214[empty]
+    classifier = JavaClassImpl@191['CharSequence']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@214['CharSequence'] {
-    arguments = ArrayList@215[empty]
-    classifier = JavaClassImpl@183['CharSequence']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@80['CharSequence'] {
+    classifier = JavaClassImpl@215['CharSequence']
+    typeConstructor = DeserializedClassTypeConstructor@177
 }
 
-LazyJavaClassifierType@81['CharSequence'] {
-    classifier = JavaClassImpl@216['CharSequence']
-    typeConstructor = DeserializedClassTypeConstructor@178
+LazyJavaClassifierType@73['Exception'] {
+    arguments = ArrayList@216[empty]
+    classifier = JavaClassImpl@217['Exception']
+    typeConstructor = LazyJavaClassTypeConstructor@25['Exception']
 }
 
-LazyJavaClassifierType@74['Exception'] {
-    arguments = ArrayList@217[empty]
-    classifier = JavaClassImpl@218['Exception']
-    typeConstructor = LazyJavaClassTypeConstructor@27['Exception']
+LazyJavaClassifierType@218['Object'] {
+    arguments = ArrayList@219[empty]
+    classifier = JavaClassImpl@220['Object']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@221
 }
 
-LazyJavaClassifierType@219['Object'] {
-    arguments = ArrayList@220[empty]
-    classifier = JavaClassImpl@221['Object']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@222
+LazyJavaClassifierType@222['Object'] {
+    arguments = ArrayList@223[empty]
+    classifier = JavaClassImpl@224['Object']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@221
 }
 
-LazyJavaClassifierType@223['Object'] {
-    arguments = ArrayList@224[empty]
-    classifier = JavaClassImpl@225['Object']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@222
+LazyJavaClassifierType@225['Object'] {
+    arguments = ArrayList@226[empty]
+    classifier = JavaClassImpl@220['Object']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@221
 }
 
-LazyJavaClassifierType@226['Object'] {
-    arguments = ArrayList@227[empty]
-    classifier = JavaClassImpl@225['Object']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@222
+LazyJavaClassifierType@227['Object'] {
+    arguments = ArrayList@228[empty]
+    classifier = JavaClassImpl@224['Object']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@221
 }
 
-LazyJavaClassifierType@228['Object'] {
-    arguments = ArrayList@229[empty]
-    classifier = JavaClassImpl@221['Object']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@222
+LazyJavaClassifierType@229['Object'] {
+    classifier = JavaClassImpl@230['Object']
+    typeConstructor = DeserializedClassTypeConstructor@221
 }
 
-LazyJavaClassifierType@230['Object'] {
-    classifier = JavaClassImpl@231['Object']
-    typeConstructor = DeserializedClassTypeConstructor@222
+LazyJavaClassifierType@231['Object'] {
+    classifier = JavaClassImpl@232['Object']
+    typeConstructor = DeserializedClassTypeConstructor@221
 }
 
-LazyJavaClassifierType@232['Object'] {
-    classifier = JavaClassImpl@233['Object']
-    typeConstructor = DeserializedClassTypeConstructor@222
+LazyJavaClassifierType@233['Object'] {
+    classifier = JavaClassImpl@234['Object']
+    typeConstructor = DeserializedClassTypeConstructor@221
 }
 
-LazyJavaClassifierType@234['Object'] {
-    classifier = JavaClassImpl@235['Object']
-    typeConstructor = DeserializedClassTypeConstructor@222
+LazyJavaClassifierType@70['RuntimeException'] {
+    arguments = ArrayList@235[empty]
+    classifier = JavaClassImpl@236['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@34['RuntimeException']
 }
 
-LazyJavaClassifierType@71['RuntimeException'] {
-    arguments = ArrayList@236[empty]
-    classifier = JavaClassImpl@237['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@36['RuntimeException']
+LazyJavaClassifierType@84['Serializable'] {
+    arguments = ArrayList@237[empty]
+    classifier = JavaClassImpl@238['Serializable']
+    memberScope = LazyJavaClassMemberScope@36
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
-LazyJavaClassifierType@85['Serializable'] {
-    arguments = ArrayList@238[empty]
+LazyJavaClassifierType@79['Serializable'] {
     classifier = JavaClassImpl@239['Serializable']
-    memberScope = LazyJavaClassMemberScope@38
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@38['Serializable']
 }
 
-LazyJavaClassifierType@80['Serializable'] {
-    classifier = JavaClassImpl@240['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@40['Serializable']
+LazyJavaClassifierType@240['String'] {
+    arguments = ArrayList@241[empty]
+    classifier = JavaClassImpl@242['String']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@241['String'] {
-    arguments = ArrayList@242[empty]
-    classifier = JavaClassImpl@243['String']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@244['String'] {
+    arguments = ArrayList@245[empty]
+    classifier = JavaClassImpl@246['String']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@245['String'] {
-    arguments = ArrayList@246[empty]
-    classifier = JavaClassImpl@247['String']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@247['String'] {
+    arguments = ArrayList@248[empty]
+    classifier = JavaClassImpl@249['String']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@248['String'] {
-    arguments = ArrayList@249[empty]
-    classifier = JavaClassImpl@250['String']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@250['String'] {
+    arguments = ArrayList@251[empty]
+    classifier = JavaClassImpl@252['String']
+    nullable = 'false': Boolean@91
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@251['String'] {
-    arguments = ArrayList@252[empty]
-    classifier = JavaClassImpl@253['String']
-    nullable = 'false': Boolean@92
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@253['String'] {
+    arguments = ArrayList@254[empty]
+    classifier = JavaClassImpl@252['String']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@254['String'] {
-    arguments = ArrayList@255[empty]
-    classifier = JavaClassImpl@250['String']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@255['String'] {
+    arguments = ArrayList@256[empty]
+    classifier = JavaClassImpl@242['String']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@256['String'] {
-    arguments = ArrayList@257[empty]
-    classifier = JavaClassImpl@247['String']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@257['String'] {
+    arguments = ArrayList@258[empty]
+    classifier = JavaClassImpl@246['String']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@258['String'] {
-    arguments = ArrayList@259[empty]
-    classifier = JavaClassImpl@243['String']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@259['String'] {
+    arguments = ArrayList@260[empty]
+    classifier = JavaClassImpl@249['String']
+    nullable = 'true': Boolean@130
+    typeConstructor = DeserializedClassTypeConstructor@243
 }
 
-LazyJavaClassifierType@260['String'] {
-    arguments = ArrayList@261[empty]
-    classifier = JavaClassImpl@253['String']
-    nullable = 'true': Boolean@131
-    typeConstructor = DeserializedClassTypeConstructor@244
+LazyJavaClassifierType@261['StringBuffer'] {
+    arguments = ArrayList@262[empty]
+    classifier = JavaClassImpl@263['StringBuffer']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassifierType@262['StringBuffer'] {
-    arguments = ArrayList@263[empty]
-    classifier = JavaClassImpl@264['StringBuffer']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+LazyJavaClassifierType@264['StringBuffer'] {
+    arguments = ArrayList@265[empty]
+    classifier = JavaClassImpl@266['StringBuffer']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassifierType@265['StringBuffer'] {
-    arguments = ArrayList@266[empty]
-    classifier = JavaClassImpl@267['StringBuffer']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+LazyJavaClassifierType@267['StringBuffer'] {
+    arguments = ArrayList@268[empty]
+    classifier = JavaClassImpl@263['StringBuffer']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassifierType@268['StringBuffer'] {
-    arguments = ArrayList@269[empty]
-    classifier = JavaClassImpl@264['StringBuffer']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+LazyJavaClassifierType@269['StringBuffer'] {
+    arguments = ArrayList@270[empty]
+    classifier = JavaClassImpl@266['StringBuffer']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@40['StringBuffer']
 }
 
-LazyJavaClassifierType@270['StringBuffer'] {
-    arguments = ArrayList@271[empty]
-    classifier = JavaClassImpl@267['StringBuffer']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@42['StringBuffer']
+LazyJavaClassifierType@271['StringBuilder'] {
+    arguments = ArrayList@272[empty]
+    classifier = JavaClassImpl@273['StringBuilder']
+    memberScope = LazyJavaClassMemberScope@46
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@272['StringBuilder'] {
-    arguments = ArrayList@273[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
-    memberScope = LazyJavaClassMemberScope@48
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@274['StringBuilder'] {
+    arguments = ArrayList@275[empty]
+    classifier = JavaClassImpl@276['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@275['StringBuilder'] {
-    arguments = ArrayList@276[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@277['StringBuilder'] {
+    arguments = ArrayList@278[empty]
+    classifier = JavaClassImpl@279['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@278['StringBuilder'] {
-    arguments = ArrayList@279[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@280['StringBuilder'] {
+    arguments = ArrayList@281[empty]
+    classifier = JavaClassImpl@282['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@281['StringBuilder'] {
-    arguments = ArrayList@282[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@283['StringBuilder'] {
+    arguments = ArrayList@284[empty]
+    classifier = JavaClassImpl@285['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@284['StringBuilder'] {
-    arguments = ArrayList@285[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@286['StringBuilder'] {
+    arguments = ArrayList@287[empty]
+    classifier = JavaClassImpl@288['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@287['StringBuilder'] {
-    arguments = ArrayList@288[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@289['StringBuilder'] {
+    arguments = ArrayList@290[empty]
+    classifier = JavaClassImpl@291['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@290['StringBuilder'] {
-    arguments = ArrayList@291[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@292['StringBuilder'] {
+    arguments = ArrayList@293[empty]
+    classifier = JavaClassImpl@294['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@293['StringBuilder'] {
-    arguments = ArrayList@294[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@295['StringBuilder'] {
+    arguments = ArrayList@296[empty]
+    classifier = JavaClassImpl@297['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@296['StringBuilder'] {
-    arguments = ArrayList@297[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@298['StringBuilder'] {
+    arguments = ArrayList@299[empty]
+    classifier = JavaClassImpl@300['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@299['StringBuilder'] {
-    arguments = ArrayList@300[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@301['StringBuilder'] {
+    arguments = ArrayList@302[empty]
+    classifier = JavaClassImpl@303['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@302['StringBuilder'] {
-    arguments = ArrayList@303[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@304['StringBuilder'] {
+    arguments = ArrayList@305[empty]
+    classifier = JavaClassImpl@306['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@305['StringBuilder'] {
-    arguments = ArrayList@306[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@307['StringBuilder'] {
+    arguments = ArrayList@308[empty]
+    classifier = JavaClassImpl@309['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@308['StringBuilder'] {
-    arguments = ArrayList@309[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@310['StringBuilder'] {
+    arguments = ArrayList@311[empty]
+    classifier = JavaClassImpl@312['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@311['StringBuilder'] {
-    arguments = ArrayList@312[empty]
-    classifier = JavaClassImpl@313['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@313['StringBuilder'] {
+    arguments = ArrayList@314[empty]
+    classifier = JavaClassImpl@315['StringBuilder']
+    nullable = 'false': Boolean@91
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@314['StringBuilder'] {
-    arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@316['StringBuilder']
-    nullable = 'false': Boolean@92
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@316['StringBuilder'] {
+    arguments = ArrayList@317[empty]
+    classifier = JavaClassImpl@273['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@317['StringBuilder'] {
-    arguments = ArrayList@318[empty]
-    classifier = JavaClassImpl@295['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@318['StringBuilder'] {
+    arguments = ArrayList@319[empty]
+    classifier = JavaClassImpl@309['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@319['StringBuilder'] {
-    arguments = ArrayList@320[empty]
-    classifier = JavaClassImpl@292['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@320['StringBuilder'] {
+    arguments = ArrayList@321[empty]
+    classifier = JavaClassImpl@288['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@321['StringBuilder'] {
-    arguments = ArrayList@322[empty]
-    classifier = JavaClassImpl@313['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@322['StringBuilder'] {
+    arguments = ArrayList@323[empty]
+    classifier = JavaClassImpl@294['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@323['StringBuilder'] {
-    arguments = ArrayList@324[empty]
-    classifier = JavaClassImpl@277['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@324['StringBuilder'] {
+    arguments = ArrayList@325[empty]
+    classifier = JavaClassImpl@297['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@325['StringBuilder'] {
-    arguments = ArrayList@326[empty]
-    classifier = JavaClassImpl@286['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@326['StringBuilder'] {
+    arguments = ArrayList@327[empty]
+    classifier = JavaClassImpl@300['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@327['StringBuilder'] {
-    arguments = ArrayList@328[empty]
-    classifier = JavaClassImpl@280['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@328['StringBuilder'] {
+    arguments = ArrayList@329[empty]
+    classifier = JavaClassImpl@303['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@329['StringBuilder'] {
-    arguments = ArrayList@330[empty]
-    classifier = JavaClassImpl@289['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@330['StringBuilder'] {
+    arguments = ArrayList@331[empty]
+    classifier = JavaClassImpl@279['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@331['StringBuilder'] {
-    arguments = ArrayList@332[empty]
-    classifier = JavaClassImpl@283['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@332['StringBuilder'] {
+    arguments = ArrayList@333[empty]
+    classifier = JavaClassImpl@276['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@333['StringBuilder'] {
-    arguments = ArrayList@334[empty]
-    classifier = JavaClassImpl@301['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@334['StringBuilder'] {
+    arguments = ArrayList@335[empty]
+    classifier = JavaClassImpl@315['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@335['StringBuilder'] {
-    arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@298['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@336['StringBuilder'] {
+    arguments = ArrayList@337[empty]
+    classifier = JavaClassImpl@285['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@337['StringBuilder'] {
-    arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@307['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@338['StringBuilder'] {
+    arguments = ArrayList@339[empty]
+    classifier = JavaClassImpl@306['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@339['StringBuilder'] {
-    arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@316['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@340['StringBuilder'] {
+    arguments = ArrayList@341[empty]
+    classifier = JavaClassImpl@282['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@341['StringBuilder'] {
-    arguments = ArrayList@342[empty]
-    classifier = JavaClassImpl@274['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@342['StringBuilder'] {
+    arguments = ArrayList@343[empty]
+    classifier = JavaClassImpl@312['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@343['StringBuilder'] {
-    arguments = ArrayList@344[empty]
-    classifier = JavaClassImpl@310['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+LazyJavaClassifierType@344['StringBuilder'] {
+    arguments = ArrayList@345[empty]
+    classifier = JavaClassImpl@291['StringBuilder']
+    nullable = 'true': Boolean@130
+    typeConstructor = LazyJavaClassTypeConstructor@57['StringBuilder']
 }
 
-LazyJavaClassifierType@345['StringBuilder'] {
+LazyJavaClassifierType@67['Throwable'] {
     arguments = ArrayList@346[empty]
-    classifier = JavaClassImpl@304['StringBuilder']
-    nullable = 'true': Boolean@131
-    typeConstructor = LazyJavaClassTypeConstructor@58['StringBuilder']
+    classifier = JavaClassImpl@347['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@348
 }
 
-LazyJavaClassifierType@68['Throwable'] {
-    arguments = ArrayList@347[empty]
-    classifier = JavaClassImpl@348['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@349
+LazyJavaPackageFragmentProvider@349 {
+    packageFragments('<root>': FqName@350) = LazyJavaPackageFragment@351['<root>']
+    packageFragments('Any': FqName@352) = null
+    packageFragments('Array': FqName@353) = null
+    packageFragments('Int': FqName@354) = null
+    packageFragments('String': FqName@355) = null
+    packageFragments('StringBuilder': FqName@356) = null
+    packageFragments('StringBuilder.Any': FqName@357) = null
+    packageFragments('StringBuilder.Array': FqName@358) = null
+    packageFragments('StringBuilder.Int': FqName@359) = null
+    packageFragments('StringBuilder.String': FqName@360) = null
+    packageFragments('StringBuilder.StringBuilder': FqName@361) = null
+    packageFragments('StringBuilder.T': FqName@362) = null
+    packageFragments('StringBuilder.bd': FqName@363) = null
+    packageFragments('T': FqName@364) = null
+    packageFragments('java': FqName@365) = LazyJavaPackageFragment@366['java']
+    packageFragments('java.io': FqName@367) = LazyJavaPackageFragment@368['io']
+    packageFragments('java.lang': FqName@369) = LazyJavaPackageFragment@370['lang']
+    packageFragments('java.lang.Any': FqName@371) = null
+    packageFragments('java.lang.Array': FqName@372) = null
+    packageFragments('java.lang.Int': FqName@373) = null
+    packageFragments('java.lang.String': FqName@374) = null
+    packageFragments('java.lang.T': FqName@375) = null
+    packageFragments('kotlin': FqName@376) = null
+    packageFragments('kotlin.Any': FqName@377) = null
+    packageFragments('kotlin.Array': FqName@378) = null
+    packageFragments('kotlin.Int': FqName@379) = null
+    packageFragments('kotlin.String': FqName@380) = null
+    packageFragments('kotlin.T': FqName@381) = null
+    packageFragments('kotlin.io': FqName@382) = null
+    packageFragments('kotlin.jvm': FqName@383) = null
+    topLevelClasses(JavaClassImpl@87['AbstractStringBuilder']) = LazyJavaClassDescriptor@0['AbstractStringBuilder']
+    topLevelClasses(JavaClassImpl@158['Appendable']) = LazyJavaClassDescriptor@13['Appendable']
+    topLevelClasses(JavaClassImpl@217['Exception']) = LazyJavaClassDescriptor@24['Exception']
+    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@385['StringBuilder']) = LazyJavaClassDescriptor@41['StringBuilder']
 }
 
-LazyJavaPackageFragmentProvider@350 {
-    packageFragments('<root>': FqName@351) = LazyJavaPackageFragment@352['<root>']
-    packageFragments('Any': FqName@353) = null
-    packageFragments('Array': FqName@354) = null
-    packageFragments('Int': FqName@355) = null
-    packageFragments('String': FqName@356) = null
-    packageFragments('StringBuilder': FqName@357) = null
-    packageFragments('StringBuilder.Any': FqName@358) = null
-    packageFragments('StringBuilder.Array': FqName@359) = null
-    packageFragments('StringBuilder.Int': FqName@360) = null
-    packageFragments('StringBuilder.String': FqName@361) = null
-    packageFragments('StringBuilder.StringBuilder': FqName@362) = null
-    packageFragments('StringBuilder.T': FqName@363) = null
-    packageFragments('StringBuilder.bd': FqName@364) = null
-    packageFragments('T': FqName@365) = null
-    packageFragments('java': FqName@366) = LazyJavaPackageFragment@367['java']
-    packageFragments('java.io': FqName@368) = LazyJavaPackageFragment@369['io']
-    packageFragments('java.lang': FqName@370) = LazyJavaPackageFragment@371['lang']
-    packageFragments('java.lang.Any': FqName@372) = null
-    packageFragments('java.lang.Array': FqName@373) = null
-    packageFragments('java.lang.Int': FqName@374) = null
-    packageFragments('java.lang.String': FqName@375) = null
-    packageFragments('java.lang.T': FqName@376) = null
-    packageFragments('kotlin': FqName@377) = null
-    packageFragments('kotlin.Any': FqName@378) = null
-    packageFragments('kotlin.Array': FqName@379) = null
-    packageFragments('kotlin.Int': FqName@380) = null
-    packageFragments('kotlin.String': FqName@381) = null
-    packageFragments('kotlin.T': FqName@382) = null
-    packageFragments('kotlin.io': FqName@383) = null
-    packageFragments('kotlin.jvm': FqName@384) = null
-    topLevelClasses(JavaClassImpl@88['AbstractStringBuilder']) = LazyJavaClassDescriptor@0['AbstractStringBuilder']
-    topLevelClasses(JavaClassImpl@159['Appendable']) = LazyJavaClassDescriptor@15['Appendable']
-    topLevelClasses(JavaClassImpl@218['Exception']) = LazyJavaClassDescriptor@26['Exception']
-    topLevelClasses(JavaClassImpl@385['NullPointerException']) = LazyJavaClassDescriptor@28['NullPointerException']
-    topLevelClasses(JavaClassImpl@237['RuntimeException']) = LazyJavaClassDescriptor@35['RuntimeException']
-    topLevelClasses(JavaClassImpl@239['Serializable']) = LazyJavaClassDescriptor@37['Serializable']
-    topLevelClasses(JavaClassImpl@264['StringBuffer']) = LazyJavaClassDescriptor@41['StringBuffer']
-    topLevelClasses(JavaClassImpl@386['StringBuilder']) = LazyJavaClassDescriptor@43['StringBuilder']
+LazyJavaPackageFragment@366['java'] {
+    classes('lang': Name@386) = null // through LazyPackageFragmentScopeForJavaPackage@387
+    deserializedPackageScope = Empty@388 // through LazyPackageFragmentScopeForJavaPackage@387
+    functions('lang': Name@389) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@387
+    memberIndex = computeMemberIndex$1@390 // through LazyPackageFragmentScopeForJavaPackage@387
 }
 
-LazyJavaPackageFragment@367['java'] {
-    classes('lang': Name@387) = null // through LazyPackageFragmentScopeForJavaPackage@388
-    deserializedPackageScope = Empty@389 // through LazyPackageFragmentScopeForJavaPackage@388
-    functions('lang': Name@390) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@388
-    memberIndex = computeMemberIndex$1@391 // through LazyPackageFragmentScopeForJavaPackage@388
+LazyJavaPackageFragment@370['lang'] {
+    classes('NullPointerException': Name@391) = LazyJavaClassDescriptor@26['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@392
+    classes('StringBuilder': Name@393) = LazyJavaClassDescriptor@41['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@392
+    classes('equals': Name@394) = null // through LazyPackageFragmentScopeForJavaPackage@392
+    classes('sure1': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@392
+    deserializedPackageScope = Empty@388 // through LazyPackageFragmentScopeForJavaPackage@392
+    functions('NullPointerException': Name@391) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
+    functions('StringBuilder': Name@395) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
+    functions('equals': Name@394) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
+    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@392
+    memberIndex = computeMemberIndex$1@396 // through LazyPackageFragmentScopeForJavaPackage@392
 }
 
-LazyJavaPackageFragment@371['lang'] {
-    classes('NullPointerException': Name@392) = LazyJavaClassDescriptor@28['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@393
-    classes('StringBuilder': Name@394) = LazyJavaClassDescriptor@43['StringBuilder'] // through LazyPackageFragmentScopeForJavaPackage@393
-    classes('append': Name@11) = null // through LazyPackageFragmentScopeForJavaPackage@393
-    classes('equals': Name@395) = null // through LazyPackageFragmentScopeForJavaPackage@393
-    classes('sure1': Name@8) = null // through LazyPackageFragmentScopeForJavaPackage@393
-    classes('toString': Name@396) = null // through LazyPackageFragmentScopeForJavaPackage@393
-    deserializedPackageScope = Empty@389 // through LazyPackageFragmentScopeForJavaPackage@393
-    functions('NullPointerException': Name@392) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@393
-    functions('StringBuilder': Name@397) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@393
-    functions('append': Name@11) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@393
-    functions('equals': Name@395) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@393
-    functions('sure1': Name@8) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@393
-    functions('toString': Name@396) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@393
-    memberIndex = computeMemberIndex$1@398 // through LazyPackageFragmentScopeForJavaPackage@393
+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 {
+    <name not found> = ArrayList@405[1] { ResolutionCandidate@406 }
+    <name not found> = ArrayList@407[1] { ResolutionCandidate@406 }
+    <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@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[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> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@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, ... }
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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 403a011a292..51ce710030e 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt526UnresolvedReferenceInnerStatic.lazy.log
@@ -25,8 +25,27 @@ LazyJavaPackageFragment@10['java'] {
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('Bar': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Bar': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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 }
+    <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 eb6710f860d..75bea8ca62b 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt549.lazy.log
@@ -2,92 +2,81 @@ 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['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('add': Name@13) = ArrayList@14[2] { JavaMethodDescriptor@15['add'], JavaMethodDescriptor@16['add'] } // through LazyJavaClassMemberScope@17
-    memberIndex = computeMemberIndex$1@18 // through LazyJavaClassMemberScope@17
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@17
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+LazyJavaClassDescriptor@9['AbstractList'] {
+    defaultType = JetTypeImpl@10['AbstractList<1>']
+    functions('add': Name@11) = ArrayList@12[2] { JavaMethodDescriptor@13['add'], JavaMethodDescriptor@14['add'] } // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
-LazyJavaClassDescriptor@21['Appendable'] {
-    functions('println': Name@22) = EmptyList@8[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    properties('println': Name@25) = EmptyList@8[empty] // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@26['Appendable']
+LazyJavaClassDescriptor@19['Appendable'] {
+    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Appendable']
 }
 
-LazyJavaClassDescriptor@27['ArrayList'] {
-    constructors = ArrayList@28[3] { JavaConstructorDescriptor@29['<init>'], JavaConstructorDescriptor@30['<init>'], JavaConstructorDescriptor@31['<init>'] } // through LazyJavaClassMemberScope@32
-    defaultType = JetTypeImpl@33['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@32
+LazyJavaClassDescriptor@25['ArrayList'] {
+    constructors = ArrayList@26[3] { JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'], JavaConstructorDescriptor@29['<init>'] } // through LazyJavaClassMemberScope@30
+    defaultType = JetTypeImpl@31['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@32 // through LazyJavaClassMemberScope@30
     functionTypeForSamInterface = null
-    functions('add': Name@7) = ArrayList@35[2] { JavaMethodDescriptor@36['add'], JavaMethodDescriptor@37['add'] } // through LazyJavaClassMemberScope@32
-    memberIndex = computeMemberIndex$1@38 // through LazyJavaClassMemberScope@32
-    nestedClassIndex = LinkedHashMap@39 // through LazyJavaClassMemberScope@32
-    nestedClasses('add': Name@7) = null // through LazyJavaClassMemberScope@32
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@32
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@40['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@41['ArrayList']
+    functions('add': Name@33) = ArrayList@34[2] { JavaMethodDescriptor@35['add'], JavaMethodDescriptor@36['add'] } // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@30
+    nestedClassIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@30
+    nestedClasses('add': Name@33) = null // through LazyJavaClassMemberScope@30
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@39['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@40['ArrayList']
 }
 
-LazyJavaClassDescriptor@42['AutoCloseable'] {
-    functions('println': Name@22) = EmptyList@8[empty] // through LazyJavaClassMemberScope@43
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@43
-    properties('println': Name@25) = EmptyList@8[empty] // through LazyJavaClassMemberScope@43
-    typeConstructor = LazyJavaClassTypeConstructor@45['AutoCloseable']
+LazyJavaClassDescriptor@41['AutoCloseable'] {
+    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@42
+    memberIndex = computeMemberIndex$1@43 // through LazyJavaClassMemberScope@42
+    typeConstructor = LazyJavaClassTypeConstructor@44['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@46['Closeable'] {
-    functions('println': Name@22) = EmptyList@8[empty] // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@48 // through LazyJavaClassMemberScope@47
-    properties('println': Name@25) = EmptyList@8[empty] // through LazyJavaClassMemberScope@47
-    typeConstructor = LazyJavaClassTypeConstructor@49['Closeable']
+LazyJavaClassDescriptor@45['Closeable'] {
+    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@46
+    memberIndex = computeMemberIndex$1@47 // through LazyJavaClassMemberScope@46
+    typeConstructor = LazyJavaClassTypeConstructor@48['Closeable']
 }
 
-LazyJavaClassDescriptor@50['FilterOutputStream'] {
-    functions('println': Name@22) = EmptyList@8[empty] // through LazyJavaClassMemberScope@51
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@51
-    properties('println': Name@25) = EmptyList@8[empty] // through LazyJavaClassMemberScope@51
-    typeConstructor = LazyJavaClassTypeConstructor@53['FilterOutputStream']
+LazyJavaClassDescriptor@49['FilterOutputStream'] {
+    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@50
+    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
+    typeConstructor = LazyJavaClassTypeConstructor@52['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@54['OutputStream'] {
-    functions('println': Name@22) = EmptyList@8[empty] // through LazyJavaClassMemberScope@55
-    memberIndex = computeMemberIndex$1@56 // through LazyJavaClassMemberScope@55
-    properties('println': Name@25) = EmptyList@8[empty] // through LazyJavaClassMemberScope@55
-    typeConstructor = LazyJavaClassTypeConstructor@57['OutputStream']
+LazyJavaClassDescriptor@53['OutputStream'] {
+    functions('println': Name@20) = EmptyList@21[empty] // through LazyJavaClassMemberScope@54
+    memberIndex = computeMemberIndex$1@55 // through LazyJavaClassMemberScope@54
+    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
 }
 
-LazyJavaClassDescriptor@58['PrintStream'] {
-    defaultType = JetTypeImpl@59['PrintStream']
-    enumEntryIndex = LinkedHashMap@60 // through LazyJavaClassMemberScope@61
-    functions('println': Name@25) = ArrayList@62[10] { JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], ... } // through LazyJavaClassMemberScope@61
-    memberIndex = computeMemberIndex$1@66 // through LazyJavaClassMemberScope@61
-    nestedClassIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@61
-    nestedClasses('println': Name@25) = null // through LazyJavaClassMemberScope@61
-    properties('println': Name@25) = EmptyList@8[empty] // through LazyJavaClassMemberScope@61
+LazyJavaClassDescriptor@57['PrintStream'] {
+    defaultType = JetTypeImpl@58['PrintStream']
+    enumEntryIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@60
+    functions('println': Name@61) = ArrayList@62[10] { JavaMethodDescriptor@63['println'], JavaMethodDescriptor@64['println'], JavaMethodDescriptor@65['println'], ... } // through LazyJavaClassMemberScope@60
+    memberIndex = computeMemberIndex$1@66 // through LazyJavaClassMemberScope@60
+    nestedClassIndex = LinkedHashMap@67 // through LazyJavaClassMemberScope@60
+    nestedClasses('println': Name@61) = null // through LazyJavaClassMemberScope@60
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@68['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
 }
 
 LazyJavaClassDescriptor@70['RandomAccess'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@71
+    functions('add': Name@11) = EmptyList@21[empty] // through LazyJavaClassMemberScope@71
     memberIndex = computeMemberIndex$1@72 // through LazyJavaClassMemberScope@71
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@71
     typeConstructor = LazyJavaClassTypeConstructor@73['RandomAccess']
 }
 
 LazyJavaClassDescriptor@74['Serializable'] {
-    functions('add': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@75
+    functions('add': Name@11) = EmptyList@21[empty] // through LazyJavaClassMemberScope@75
     memberIndex = computeMemberIndex$1@76 // through LazyJavaClassMemberScope@75
-    properties('add': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@75
     typeConstructor = LazyJavaClassTypeConstructor@77['Serializable']
 }
 
@@ -98,46 +87,46 @@ LazyJavaClassDescriptor@78['System'] {
     nestedClassIndex = LinkedHashMap@84 // through LazyJavaClassMemberScope@80
     nestedClasses('out': Name@85) = null // through LazyJavaClassMemberScope@80
     properties('out': Name@85) = ArrayList@86[1] { JavaPropertyDescriptor@87['out'] } // through LazyJavaStaticClassScope@83
-    properties('out': Name@85) = EmptyList@8[empty] // through LazyJavaClassMemberScope@80
+    properties('out': Name@85) = EmptyList@21[empty] // through LazyJavaClassMemberScope@80
     typeConstructor = LazyJavaClassTypeConstructor@88['System']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@89[1] { LazyJavaTypeParameterDescriptor@90['E'] }
     supertypes = ArrayList@91[1] { LazyJavaClassifierType@92['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@20['AbstractList'] {
+LazyJavaClassTypeConstructor@18['AbstractList'] {
     parameters = ArrayList@93[1] { LazyJavaTypeParameterDescriptor@94['E'] }
     supertypes = ArrayList@95[2] { LazyJavaClassifierType@96['AbstractCollection<E>'], LazyJavaClassifierType@97['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@26['Appendable'] {
+LazyJavaClassTypeConstructor@24['Appendable'] {
     parameters = ArrayList@98[empty]
     supertypes = ArrayList@99[1] { JetTypeImpl@100['Any'] }
 }
 
-LazyJavaClassTypeConstructor@41['ArrayList'] {
+LazyJavaClassTypeConstructor@40['ArrayList'] {
     parameters = ArrayList@101[1] { LazyJavaTypeParameterDescriptor@102['E'] }
     supertypes = ArrayList@103[5] { LazyJavaClassifierType@104['AbstractList<E>'], LazyJavaClassifierType@105['List<E>'], LazyJavaClassifierType@106['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@45['AutoCloseable'] {
+LazyJavaClassTypeConstructor@44['AutoCloseable'] {
     parameters = ArrayList@107[empty]
     supertypes = ArrayList@108[1] { JetTypeImpl@100['Any'] }
 }
 
-LazyJavaClassTypeConstructor@49['Closeable'] {
+LazyJavaClassTypeConstructor@48['Closeable'] {
     parameters = ArrayList@109[empty]
     supertypes = ArrayList@110[1] { LazyJavaClassifierType@111['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@53['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@52['FilterOutputStream'] {
     parameters = ArrayList@112[empty]
     supertypes = ArrayList@113[1] { LazyJavaClassifierType@114['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@57['OutputStream'] {
+LazyJavaClassTypeConstructor@56['OutputStream'] {
     parameters = ArrayList@115[empty]
     supertypes = ArrayList@116[1] { LazyJavaClassifierType@117['Closeable'] }
 }
@@ -165,28 +154,28 @@ LazyJavaClassifierType@96['AbstractCollection<E>'] {
     arguments = ArrayList@128[1] { TypeProjectionImpl@129 }
     classifier = JavaClassImpl@130['AbstractCollection']
     memberScope = SubstitutingScope@131
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@104['AbstractList<E>'] {
     arguments = ArrayList@132[1] { TypeProjectionImpl@133 }
     classifier = JavaClassImpl@134['AbstractList']
     memberScope = SubstitutingScope@135
-    typeConstructor = LazyJavaClassTypeConstructor@20['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractList']
 }
 
 LazyJavaClassifierType@121['Appendable'] {
     arguments = ArrayList@136[empty]
     classifier = JavaClassImpl@137['Appendable']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@26['Appendable']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['Appendable']
 }
 
 LazyJavaClassifierType@111['AutoCloseable'] {
     arguments = ArrayList@138[empty]
     classifier = JavaClassImpl@139['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@43
-    typeConstructor = LazyJavaClassTypeConstructor@45['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@42
+    typeConstructor = LazyJavaClassTypeConstructor@44['AutoCloseable']
 }
 
 LazyJavaClassifierType@140['Cloneable'] {
@@ -199,15 +188,15 @@ LazyJavaClassifierType@140['Cloneable'] {
 LazyJavaClassifierType@122['Closeable'] {
     arguments = ArrayList@145[empty]
     classifier = JavaClassImpl@146['Closeable']
-    memberScope = LazyJavaClassMemberScope@47
-    typeConstructor = LazyJavaClassTypeConstructor@49['Closeable']
+    memberScope = LazyJavaClassMemberScope@46
+    typeConstructor = LazyJavaClassTypeConstructor@48['Closeable']
 }
 
 LazyJavaClassifierType@117['Closeable'] {
     arguments = ArrayList@147[empty]
     classifier = JavaClassImpl@148['Closeable']
-    memberScope = LazyJavaClassMemberScope@47
-    typeConstructor = LazyJavaClassTypeConstructor@49['Closeable']
+    memberScope = LazyJavaClassMemberScope@46
+    typeConstructor = LazyJavaClassTypeConstructor@48['Closeable']
 }
 
 LazyJavaClassifierType@149['Collection<? extends E>'] {
@@ -251,161 +240,161 @@ LazyJavaClassifierType@173['E'] {
     arguments = ArrayList@174[empty]
     classifier = JavaTypeParameterImpl@175['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
-LazyJavaClassifierType@177['E'] {
-    arguments = ArrayList@178[empty]
-    classifier = JavaTypeParameterImpl@179['E']
+LazyJavaClassifierType@176['E'] {
+    arguments = ArrayList@177[empty]
+    classifier = JavaTypeParameterImpl@178['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
-LazyJavaClassifierType@181['E'] {
-    arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@183['E']
+LazyJavaClassifierType@179['E'] {
+    arguments = ArrayList@180[empty]
+    classifier = JavaTypeParameterImpl@181['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
-LazyJavaClassifierType@184['E'] {
-    arguments = ArrayList@185[empty]
-    classifier = JavaTypeParameterImpl@186['E']
+LazyJavaClassifierType@183['E'] {
+    arguments = ArrayList@184[empty]
+    classifier = JavaTypeParameterImpl@185['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
 }
 
 LazyJavaClassifierType@187['E'] {
     arguments = ArrayList@188[empty]
     classifier = JavaTypeParameterImpl@189['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
 }
 
 LazyJavaClassifierType@190['E'] {
     arguments = ArrayList@191[empty]
     classifier = JavaTypeParameterImpl@192['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@193['E'] {
     arguments = ArrayList@194[empty]
     classifier = JavaTypeParameterImpl@195['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@196['E'] {
     arguments = ArrayList@197[empty]
     classifier = JavaTypeParameterImpl@198['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@199['E'] {
     arguments = ArrayList@200[empty]
     classifier = JavaTypeParameterImpl@201['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@202['E'] {
     arguments = ArrayList@203[empty]
     classifier = JavaTypeParameterImpl@204['E']
     nullable = 'false': Boolean@154
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@205['E'] {
     arguments = ArrayList@206[empty]
-    classifier = JavaTypeParameterImpl@195['E']
+    classifier = JavaTypeParameterImpl@189['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
 }
 
 LazyJavaClassifierType@207['E'] {
     arguments = ArrayList@208[empty]
-    classifier = JavaTypeParameterImpl@183['E']
-    nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
-}
-
-LazyJavaClassifierType@209['E'] {
-    arguments = ArrayList@210[empty]
-    classifier = JavaTypeParameterImpl@172['E']
+    classifier = JavaTypeParameterImpl@175['E']
     nullable = 'true': Boolean@160
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
+LazyJavaClassifierType@209['E'] {
+    arguments = ArrayList@210[empty]
+    classifier = JavaTypeParameterImpl@181['E']
+    nullable = 'true': Boolean@160
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+}
+
 LazyJavaClassifierType@211['E'] {
     arguments = ArrayList@212[empty]
-    classifier = JavaTypeParameterImpl@186['E']
+    classifier = JavaTypeParameterImpl@168['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@213['E'] {
     arguments = ArrayList@214[empty]
-    classifier = JavaTypeParameterImpl@189['E']
+    classifier = JavaTypeParameterImpl@178['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@215['E'] {
     arguments = ArrayList@216[empty]
-    classifier = JavaTypeParameterImpl@201['E']
+    classifier = JavaTypeParameterImpl@185['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
 }
 
 LazyJavaClassifierType@217['E'] {
     arguments = ArrayList@218[empty]
     classifier = JavaTypeParameterImpl@192['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@219['E'] {
     arguments = ArrayList@220[empty]
-    classifier = JavaTypeParameterImpl@168['E']
+    classifier = JavaTypeParameterImpl@201['E']
     nullable = 'true': Boolean@160
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@221['E'] {
     arguments = ArrayList@222[empty]
-    classifier = JavaTypeParameterImpl@179['E']
+    classifier = JavaTypeParameterImpl@198['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@223['E'] {
     arguments = ArrayList@224[empty]
-    classifier = JavaTypeParameterImpl@175['E']
+    classifier = JavaTypeParameterImpl@204['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
 }
 
 LazyJavaClassifierType@225['E'] {
     arguments = ArrayList@226[empty]
-    classifier = JavaTypeParameterImpl@198['E']
+    classifier = JavaTypeParameterImpl@195['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@227['E'] {
     arguments = ArrayList@228[empty]
-    classifier = JavaTypeParameterImpl@204['E']
+    classifier = JavaTypeParameterImpl@172['E']
     nullable = 'true': Boolean@160
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
 }
 
 LazyJavaClassifierType@120['FilterOutputStream'] {
     arguments = ArrayList@229[empty]
     classifier = JavaClassImpl@230['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@51
-    typeConstructor = LazyJavaClassTypeConstructor@53['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@50
+    typeConstructor = LazyJavaClassTypeConstructor@52['FilterOutputStream']
 }
 
 LazyJavaClassifierType@231['Flushable'] {
@@ -479,14 +468,14 @@ LazyJavaClassifierType@260['Object'] {
 LazyJavaClassifierType@114['OutputStream'] {
     arguments = ArrayList@262[empty]
     classifier = JavaClassImpl@263['OutputStream']
-    memberScope = LazyJavaClassMemberScope@55
-    typeConstructor = LazyJavaClassTypeConstructor@57['OutputStream']
+    memberScope = LazyJavaClassMemberScope@54
+    typeConstructor = LazyJavaClassTypeConstructor@56['OutputStream']
 }
 
 LazyJavaClassifierType@264['PrintStream'] {
     arguments = ArrayList@265[empty]
     classifier = JavaClassImpl@266['PrintStream']
-    memberScope = LazyJavaClassMemberScope@61
+    memberScope = LazyJavaClassMemberScope@60
     nullable = 'false': Boolean@154
     typeConstructor = LazyJavaClassTypeConstructor@69['PrintStream']
 }
@@ -562,14 +551,14 @@ LazyJavaPackageFragmentProvider@280 {
     packageFragments('kotlin.io': FqName@318) = null
     packageFragments('kotlin.jvm': FqName@319) = null
     topLevelClasses(JavaClassImpl@130['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@134['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@137['Appendable']) = LazyJavaClassDescriptor@21['Appendable']
-    topLevelClasses(JavaClassImpl@320['ArrayList']) = LazyJavaClassDescriptor@27['ArrayList']
-    topLevelClasses(JavaClassImpl@139['AutoCloseable']) = LazyJavaClassDescriptor@42['AutoCloseable']
-    topLevelClasses(JavaClassImpl@146['Closeable']) = LazyJavaClassDescriptor@46['Closeable']
-    topLevelClasses(JavaClassImpl@230['FilterOutputStream']) = LazyJavaClassDescriptor@50['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@263['OutputStream']) = LazyJavaClassDescriptor@54['OutputStream']
-    topLevelClasses(JavaClassImpl@266['PrintStream']) = LazyJavaClassDescriptor@58['PrintStream']
+    topLevelClasses(JavaClassImpl@134['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
+    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@230['FilterOutputStream']) = LazyJavaClassDescriptor@49['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@263['OutputStream']) = LazyJavaClassDescriptor@53['OutputStream']
+    topLevelClasses(JavaClassImpl@266['PrintStream']) = LazyJavaClassDescriptor@57['PrintStream']
     topLevelClasses(JavaClassImpl@270['RandomAccess']) = LazyJavaClassDescriptor@70['RandomAccess']
     topLevelClasses(JavaClassImpl@273['Serializable']) = LazyJavaClassDescriptor@74['Serializable']
     topLevelClasses(JavaClassImpl@321['System']) = LazyJavaClassDescriptor@78['System']
@@ -579,89 +568,241 @@ LazyJavaPackageFragment@298['java'] {
     classes('lang': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@323
     classes('util': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@323
     deserializedPackageScope = Empty@325 // through LazyPackageFragmentScopeForJavaPackage@323
-    functions('lang': Name@326) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@323
+    functions('lang': Name@326) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@323
     memberIndex = computeMemberIndex$1@327 // through LazyPackageFragmentScopeForJavaPackage@323
 }
 
 LazyJavaPackageFragment@302['lang'] {
     classes('System': Name@328) = LazyJavaClassDescriptor@78['System'] // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('add': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('compareTo': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('filter': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('hasNext': Name@332) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('invoke': Name@333) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('iterator': Name@334) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('java': Name@335) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('next': Name@336) = null // through LazyPackageFragmentScopeForJavaPackage@329
-    classes('println': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@329
+    classes('filter': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@329
+    classes('java': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@329
     deserializedPackageScope = Empty@325 // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('add': Name@7) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('compareTo': Name@330) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('filter': Name@331) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('hasNext': Name@332) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('invoke': Name@333) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('iterator': Name@334) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('next': Name@336) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    functions('println': Name@25) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@329
-    memberIndex = computeMemberIndex$1@337 // through LazyPackageFragmentScopeForJavaPackage@329
+    functions('filter': Name@330) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@329
+    memberIndex = computeMemberIndex$1@332 // through LazyPackageFragmentScopeForJavaPackage@329
 }
 
 LazyJavaPackageFragment@310['util'] {
-    classes('ArrayList': Name@338) = LazyJavaClassDescriptor@27['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@339
-    deserializedPackageScope = Empty@325 // through LazyPackageFragmentScopeForJavaPackage@339
-    functions('ArrayList': Name@338) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@339
-    memberIndex = computeMemberIndex$1@340 // through LazyPackageFragmentScopeForJavaPackage@339
-}
-
-LazyJavaTypeParameterDescriptor@94['E'] {
-    defaultType = JetTypeImpl@341['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@176
-    upperBounds = LinkedHashSet@342[1] { NullableType@343 }
-    upperBoundsAsType = NullableType@343
-}
-
-LazyJavaTypeParameterDescriptor@90['E'] {
-    defaultType = JetTypeImpl@344['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
-    upperBounds = LinkedHashSet@345[1] { NullableType@346 }
-    upperBoundsAsType = NullableType@346
+    classes('ArrayList': Name@333) = LazyJavaClassDescriptor@25['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@334
+    deserializedPackageScope = Empty@325 // through LazyPackageFragmentScopeForJavaPackage@334
+    functions('ArrayList': Name@333) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@334
+    memberIndex = computeMemberIndex$1@335 // through LazyPackageFragmentScopeForJavaPackage@334
 }
 
 LazyJavaTypeParameterDescriptor@102['E'] {
-    defaultType = JetTypeImpl@347['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@180
-    upperBounds = LinkedHashSet@348[1] { NullableType@349 }
-    upperBoundsAsType = NullableType@349
+    defaultType = JetTypeImpl@336['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@169
+    upperBounds = LinkedHashSet@337[1] { NullableType@338 }
+    upperBoundsAsType = NullableType@338
 }
 
-LazyJavaTypeParameterResolver@350 {
-    resolve(JavaTypeParameterImpl@351['E']) = LazyJavaTypeParameterDescriptor@90['E']
+LazyJavaTypeParameterDescriptor@90['E'] {
+    defaultType = JetTypeImpl@339['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@186
+    upperBounds = LinkedHashSet@340[1] { NullableType@341 }
+    upperBoundsAsType = NullableType@341
 }
 
-LazyJavaTypeParameterResolver@352 {
-    resolve(JavaTypeParameterImpl@353['E']) = LazyJavaTypeParameterDescriptor@94['E']
+LazyJavaTypeParameterDescriptor@94['E'] {
+    defaultType = JetTypeImpl@342['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@182
+    upperBounds = LinkedHashSet@343[1] { NullableType@344 }
+    upperBoundsAsType = NullableType@344
 }
 
-LazyJavaTypeParameterResolver@354 {
-    resolve(JavaTypeParameterImpl@355['E']) = LazyJavaTypeParameterDescriptor@102['E']
+LazyJavaTypeParameterResolver@345 {
+    resolve(JavaTypeParameterImpl@346['E']) = LazyJavaTypeParameterDescriptor@90['E']
 }
 
-LazyJavaTypeParameterResolver@356 {
-    resolve(JavaTypeParameterImpl@192['E']) = null
+LazyJavaTypeParameterResolver@347 {
+    resolve(JavaTypeParameterImpl@348['E']) = LazyJavaTypeParameterDescriptor@94['E']
 }
 
-LazyJavaTypeParameterResolver@357 {
-    resolve(JavaTypeParameterImpl@172['E']) = null
+LazyJavaTypeParameterResolver@349 {
+    resolve(JavaTypeParameterImpl@350['E']) = LazyJavaTypeParameterDescriptor@102['E']
 }
 
-LazyJavaTypeParameterResolver@358 {
+LazyJavaTypeParameterResolver@351 {
     resolve(JavaTypeParameterImpl@195['E']) = null
 }
 
-LazyJavaTypeParameterResolver@359 {
-    resolve(JavaTypeParameterImpl@201['E']) = null
+LazyJavaTypeParameterResolver@352 {
+    resolve(JavaTypeParameterImpl@181['E']) = null
 }
 
-LazyJavaTypeParameterResolver@360 {
-    resolve(JavaTypeParameterImpl@186['E']) = null
+LazyJavaTypeParameterResolver@353 {
+    resolve(JavaTypeParameterImpl@175['E']) = null
+}
+
+LazyJavaTypeParameterResolver@354 {
+    resolve(JavaTypeParameterImpl@192['E']) = null
+}
+
+LazyJavaTypeParameterResolver@355 {
+    resolve(JavaTypeParameterImpl@189['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]
+    <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 }
+    <name not found> = EmptyList@21[empty]
+    <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@378 {
+    <name not found> = ArrayList@379[1] { ResolutionCandidate@380 }
+    <name not found> = ArrayList@381[1] { ResolutionCandidate@380 }
+}
+
+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@390 {
+    <name not found> = ArrayList@391[1] { ResolutionCandidate@392 }
+    <name not found> = ArrayList@393[1] { ResolutionCandidate@392 }
+}
+
+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[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@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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@456 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@457 {
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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 adb6ceeb3de..1b2bee76bd2 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt557.lazy.log
@@ -50,3 +50,55 @@ LazyJavaPackageFragment@11['lang'] {
     functions('sure': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <name not found> = EmptyList@33[empty]
+    <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]
+    <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@53 {
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@55 }
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@55 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
index a2f4599bb0f..a801888a936 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt571.lazy.log
@@ -23,45 +23,91 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     classes('body': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('div': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('let': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('mod': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('times': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('body': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('div': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('invoke': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('let': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('mod': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('plus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('times': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('let': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('body': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('let': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
-    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
+    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('lang': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('body': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('div': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('invoke': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('let': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('mod': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('plus': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    classes('times': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('body': Name@23) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('div': Name@24) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('invoke': Name@25) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('let': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('mod': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('plus': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('times': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('body': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('let': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('body': Name@23) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('let': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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@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@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[1] { ResolutionCandidate@60 }
+    <name not found> = ArrayList@61[1] { ResolutionCandidate@60 }
+}
+
+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@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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
index 4fa133c079e..f5ae0242693 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt575.lazy.log
@@ -31,9 +31,146 @@ LazyJavaPackageFragment@9['lang'] {
     classes('C': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('bbb': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('ccc': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('inc': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
     deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
     functions('C': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('inc': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 {
+    <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]
+}
+
+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]
+    <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]
+    <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 }
+    <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 eded14960f1..022c33bdc5d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt58.lazy.log
@@ -12,139 +12,226 @@ LazyJavaClassDescriptor@2['Lock'] {
     nestedClassIndex = LinkedHashMap@13 // through LazyJavaClassMemberScope@5
     nestedClasses('lock': Name@6) = null // through LazyJavaClassMemberScope@5
     nestedClasses('unlock': Name@9) = null // through LazyJavaClassMemberScope@5
-    properties('lock': Name@6) = EmptyList@14[empty] // through LazyJavaClassMemberScope@5
-    properties('unlock': Name@9) = EmptyList@14[empty] // through LazyJavaClassMemberScope@5
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@16['Lock']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@14['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@15['Lock']
 }
 
-LazyJavaClassDescriptor@17['RuntimeException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@18['RuntimeException']
+LazyJavaClassDescriptor@16['RuntimeException'] {
+    typeConstructor = LazyJavaClassTypeConstructor@17['RuntimeException']
 }
 
-LazyJavaClassDescriptor@19['UnsupportedOperationException'] {
-    typeConstructor = LazyJavaClassTypeConstructor@20['UnsupportedOperationException']
+LazyJavaClassDescriptor@18['UnsupportedOperationException'] {
+    typeConstructor = LazyJavaClassTypeConstructor@19['UnsupportedOperationException']
 }
 
 LazyJavaClassTypeConstructor@1['Exception'] {
-    parameters = ArrayList@21[empty]
-    supertypes = ArrayList@22[1] { LazyJavaClassifierType@23['Throwable'] }
+    parameters = ArrayList@20[empty]
+    supertypes = ArrayList@21[1] { LazyJavaClassifierType@22['Throwable'] }
 }
 
-LazyJavaClassTypeConstructor@16['Lock'] {
-    parameters = ArrayList@24[empty]
-    supertypes = ArrayList@25[1] { JetTypeImpl@26['Any'] }
+LazyJavaClassTypeConstructor@15['Lock'] {
+    parameters = ArrayList@23[empty]
+    supertypes = ArrayList@24[1] { JetTypeImpl@25['Any'] }
 }
 
-LazyJavaClassTypeConstructor@18['RuntimeException'] {
-    parameters = ArrayList@27[empty]
-    supertypes = ArrayList@28[1] { LazyJavaClassifierType@29['Exception'] }
+LazyJavaClassTypeConstructor@17['RuntimeException'] {
+    parameters = ArrayList@26[empty]
+    supertypes = ArrayList@27[1] { LazyJavaClassifierType@28['Exception'] }
 }
 
-LazyJavaClassTypeConstructor@20['UnsupportedOperationException'] {
-    parameters = ArrayList@30[empty]
-    supertypes = ArrayList@31[1] { LazyJavaClassifierType@32['RuntimeException'] }
+LazyJavaClassTypeConstructor@19['UnsupportedOperationException'] {
+    parameters = ArrayList@29[empty]
+    supertypes = ArrayList@30[1] { LazyJavaClassifierType@31['RuntimeException'] }
 }
 
-LazyJavaClassifierType@29['Exception'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@34['Exception']
+LazyJavaClassifierType@28['Exception'] {
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@33['Exception']
     typeConstructor = LazyJavaClassTypeConstructor@1['Exception']
 }
 
-LazyJavaClassifierType@35['Object'] {
-    classifier = JavaClassImpl@36['Object']
-    typeConstructor = DeserializedClassTypeConstructor@37
+LazyJavaClassifierType@34['Object'] {
+    classifier = JavaClassImpl@35['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }
 
-LazyJavaClassifierType@32['RuntimeException'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['RuntimeException']
-    typeConstructor = LazyJavaClassTypeConstructor@18['RuntimeException']
+LazyJavaClassifierType@31['RuntimeException'] {
+    arguments = ArrayList@37[empty]
+    classifier = JavaClassImpl@38['RuntimeException']
+    typeConstructor = LazyJavaClassTypeConstructor@17['RuntimeException']
 }
 
-LazyJavaClassifierType@23['Throwable'] {
-    arguments = ArrayList@40[empty]
-    classifier = JavaClassImpl@41['Throwable']
-    typeConstructor = DeserializedClassTypeConstructor@42
+LazyJavaClassifierType@22['Throwable'] {
+    arguments = ArrayList@39[empty]
+    classifier = JavaClassImpl@40['Throwable']
+    typeConstructor = DeserializedClassTypeConstructor@41
 }
 
-LazyJavaPackageFragmentProvider@43 {
-    packageFragments('<root>': FqName@44) = LazyJavaPackageFragment@45['<root>']
-    packageFragments('Int': FqName@46) = null
-    packageFragments('Lock': FqName@47) = null
-    packageFragments('T': FqName@48) = null
-    packageFragments('UnsupportedOperationException': FqName@49) = null
-    packageFragments('java': FqName@50) = LazyJavaPackageFragment@51['java']
-    packageFragments('java.lang': FqName@52) = LazyJavaPackageFragment@53['lang']
-    packageFragments('java.lang.Int': FqName@54) = null
-    packageFragments('java.lang.Lock': FqName@55) = null
-    packageFragments('java.lang.T': FqName@56) = null
-    packageFragments('java.lang.UnsupportedOperationException': FqName@57) = null
-    packageFragments('java.util': FqName@58) = LazyJavaPackageFragment@59['util']
-    packageFragments('java.util.concurrent': FqName@60) = LazyJavaPackageFragment@61['concurrent']
-    packageFragments('java.util.concurrent.locks': FqName@62) = LazyJavaPackageFragment@63['locks']
-    packageFragments('java.util.concurrent.locks.Lock': FqName@64) = null
-    packageFragments('kotlin': FqName@65) = null
-    packageFragments('kotlin.Int': FqName@66) = null
-    packageFragments('kotlin.Lock': FqName@67) = null
-    packageFragments('kotlin.T': FqName@68) = null
-    packageFragments('kotlin.UnsupportedOperationException': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    packageFragments('kt58': FqName@72) = null
-    packageFragments('kt58.Int': FqName@73) = null
-    packageFragments('kt58.Lock': FqName@74) = null
-    packageFragments('kt58.T': FqName@75) = null
-    packageFragments('kt58.UnsupportedOperationException': FqName@76) = null
-    topLevelClasses(JavaClassImpl@34['Exception']) = LazyJavaClassDescriptor@0['Exception']
-    topLevelClasses(JavaClassImpl@77['Lock']) = LazyJavaClassDescriptor@2['Lock']
-    topLevelClasses(JavaClassImpl@39['RuntimeException']) = LazyJavaClassDescriptor@17['RuntimeException']
-    topLevelClasses(JavaClassImpl@78['UnsupportedOperationException']) = LazyJavaClassDescriptor@19['UnsupportedOperationException']
+LazyJavaPackageFragmentProvider@42 {
+    packageFragments('<root>': FqName@43) = LazyJavaPackageFragment@44['<root>']
+    packageFragments('Int': FqName@45) = null
+    packageFragments('Lock': FqName@46) = null
+    packageFragments('T': FqName@47) = null
+    packageFragments('UnsupportedOperationException': FqName@48) = null
+    packageFragments('java': FqName@49) = LazyJavaPackageFragment@50['java']
+    packageFragments('java.lang': FqName@51) = LazyJavaPackageFragment@52['lang']
+    packageFragments('java.lang.Int': FqName@53) = null
+    packageFragments('java.lang.Lock': FqName@54) = null
+    packageFragments('java.lang.T': FqName@55) = null
+    packageFragments('java.lang.UnsupportedOperationException': FqName@56) = null
+    packageFragments('java.util': FqName@57) = LazyJavaPackageFragment@58['util']
+    packageFragments('java.util.concurrent': FqName@59) = LazyJavaPackageFragment@60['concurrent']
+    packageFragments('java.util.concurrent.locks': FqName@61) = LazyJavaPackageFragment@62['locks']
+    packageFragments('java.util.concurrent.locks.Lock': FqName@63) = null
+    packageFragments('kotlin': FqName@64) = null
+    packageFragments('kotlin.Int': FqName@65) = null
+    packageFragments('kotlin.Lock': FqName@66) = null
+    packageFragments('kotlin.T': FqName@67) = null
+    packageFragments('kotlin.UnsupportedOperationException': FqName@68) = null
+    packageFragments('kotlin.io': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = null
+    packageFragments('kt58': FqName@71) = null
+    packageFragments('kt58.Int': FqName@72) = null
+    packageFragments('kt58.Lock': FqName@73) = null
+    packageFragments('kt58.T': FqName@74) = null
+    packageFragments('kt58.UnsupportedOperationException': FqName@75) = null
+    topLevelClasses(JavaClassImpl@33['Exception']) = LazyJavaClassDescriptor@0['Exception']
+    topLevelClasses(JavaClassImpl@76['Lock']) = LazyJavaClassDescriptor@2['Lock']
+    topLevelClasses(JavaClassImpl@38['RuntimeException']) = LazyJavaClassDescriptor@16['RuntimeException']
+    topLevelClasses(JavaClassImpl@77['UnsupportedOperationException']) = LazyJavaClassDescriptor@18['UnsupportedOperationException']
 }
 
-LazyJavaPackageFragment@61['concurrent'] {
-    classes('locks': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('locks': Name@82) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@80
+LazyJavaPackageFragment@60['concurrent'] {
+    classes('locks': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('locks': Name@81) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-LazyJavaPackageFragment@51['java'] {
+LazyJavaPackageFragment@50['java'] {
     classes('lang': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('util': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('lang': Name@87) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('util': Name@88) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('lang': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('util': Name@88) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-LazyJavaPackageFragment@53['lang'] {
-    classes('UnsupportedOperationException': Name@90) = LazyJavaClassDescriptor@19['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@91
+LazyJavaPackageFragment@52['lang'] {
+    classes('UnsupportedOperationException': Name@90) = LazyJavaClassDescriptor@18['UnsupportedOperationException'] // through LazyPackageFragmentScopeForJavaPackage@91
     classes('body': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@91
     classes('doSmth': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('invoke': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('lock': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    classes('unlock': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('body': Name@92) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('doSmth': Name@93) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('invoke': Name@94) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lock': Name@6) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('unlock': Name@9) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@91
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('body': Name@92) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    functions('doSmth': Name@93) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@91
+    memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@91
 }
 
-LazyJavaPackageFragment@63['locks'] {
-    classes('Lock': Name@96) = LazyJavaClassDescriptor@2['Lock'] // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('Lock': Name@98) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@97
+LazyJavaPackageFragment@62['locks'] {
+    classes('Lock': Name@95) = LazyJavaClassDescriptor@2['Lock'] // through LazyPackageFragmentScopeForJavaPackage@96
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@96
+    functions('Lock': Name@97) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@96
+    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@96
 }
 
-LazyJavaPackageFragment@59['util'] {
-    classes('concurrent': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('concurrent': Name@102) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
+LazyJavaPackageFragment@58['util'] {
+    classes('concurrent': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@100
+    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('concurrent': Name@101) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
+}
+
+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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
index 935c5e842ea..84ca0b9021e 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt580.lazy.log
@@ -7,59 +7,54 @@ LazyJavaClassDescriptor@3['AbstractCollection'] {
     defaultType = JetTypeImpl@4['AbstractCollection<1>']
     functions('add': Name@5) = ArrayList@6[1] { JavaMethodDescriptor@7['add'] } // through LazyJavaClassMemberScope@8
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@8
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@10['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@11['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@14['AbstractList'] {
-    defaultType = JetTypeImpl@15['AbstractList<1>']
-    functions('add': Name@16) = ArrayList@17[2] { JavaMethodDescriptor@18['add'], JavaMethodDescriptor@19['add'] } // through LazyJavaClassMemberScope@20
-    memberIndex = computeMemberIndex$1@21 // through LazyJavaClassMemberScope@20
-    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@20
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
+LazyJavaClassDescriptor@12['AbstractList'] {
+    defaultType = JetTypeImpl@13['AbstractList<1>']
+    functions('add': Name@14) = ArrayList@15[2] { JavaMethodDescriptor@16['add'], JavaMethodDescriptor@17['add'] } // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@20['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@21['AbstractList']
 }
 
-LazyJavaClassDescriptor@24['ArrayList'] {
-    constructors = ArrayList@25[3] { JavaConstructorDescriptor@26['<init>'], JavaConstructorDescriptor@27['<init>'], JavaConstructorDescriptor@28['<init>'] } // through LazyJavaClassMemberScope@29
-    defaultType = JetTypeImpl@30['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@29
+LazyJavaClassDescriptor@22['ArrayList'] {
+    constructors = ArrayList@23[3] { JavaConstructorDescriptor@24['<init>'], JavaConstructorDescriptor@25['<init>'], JavaConstructorDescriptor@26['<init>'] } // through LazyJavaClassMemberScope@27
+    defaultType = JetTypeImpl@28['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@27
     functionTypeForSamInterface = null
-    functions('add': Name@10) = ArrayList@32[2] { JavaMethodDescriptor@33['add'], JavaMethodDescriptor@34['add'] } // through LazyJavaClassMemberScope@29
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@29
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@29
-    nestedClasses('add': Name@10) = null // through LazyJavaClassMemberScope@29
-    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@29
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@38['ArrayList']
+    functions('add': Name@30) = ArrayList@31[2] { JavaMethodDescriptor@32['add'], JavaMethodDescriptor@33['add'] } // through LazyJavaClassMemberScope@27
+    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@27
+    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@27
+    nestedClasses('add': Name@30) = null // through LazyJavaClassMemberScope@27
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@37['ArrayList']
 }
 
-LazyJavaClassDescriptor@39['RandomAccess'] {
-    functions('add': Name@16) = EmptyList@11[empty] // through LazyJavaClassMemberScope@40
+LazyJavaClassDescriptor@38['RandomAccess'] {
+    functions('add': Name@14) = EmptyList@39[empty] // through LazyJavaClassMemberScope@40
     memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@40
-    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@40
     typeConstructor = LazyJavaClassTypeConstructor@42['RandomAccess']
 }
 
 LazyJavaClassDescriptor@43['Serializable'] {
-    functions('add': Name@16) = EmptyList@11[empty] // through LazyJavaClassMemberScope@44
+    functions('add': Name@14) = EmptyList@39[empty] // through LazyJavaClassMemberScope@44
     memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
-    properties('add': Name@10) = EmptyList@11[empty] // through LazyJavaClassMemberScope@44
     typeConstructor = LazyJavaClassTypeConstructor@46['Serializable']
 }
 
-LazyJavaClassTypeConstructor@13['AbstractCollection'] {
+LazyJavaClassTypeConstructor@11['AbstractCollection'] {
     parameters = ArrayList@47[1] { LazyJavaTypeParameterDescriptor@48['E'] }
     supertypes = ArrayList@49[1] { LazyJavaClassifierType@50['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@23['AbstractList'] {
+LazyJavaClassTypeConstructor@21['AbstractList'] {
     parameters = ArrayList@51[1] { LazyJavaTypeParameterDescriptor@52['E'] }
     supertypes = ArrayList@53[2] { LazyJavaClassifierType@54['AbstractCollection<E>'], LazyJavaClassifierType@55['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@38['ArrayList'] {
+LazyJavaClassTypeConstructor@37['ArrayList'] {
     parameters = ArrayList@56[1] { LazyJavaTypeParameterDescriptor@57['E'] }
     supertypes = ArrayList@58[5] { LazyJavaClassifierType@59['AbstractList<E>'], LazyJavaClassifierType@60['List<E>'], LazyJavaClassifierType@61['RandomAccess'], ... }
 }
@@ -78,14 +73,14 @@ LazyJavaClassifierType@54['AbstractCollection<E>'] {
     arguments = ArrayList@67[1] { TypeProjectionImpl@68 }
     classifier = JavaClassImpl@69['AbstractCollection']
     memberScope = SubstitutingScope@70
-    typeConstructor = LazyJavaClassTypeConstructor@13['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@11['AbstractCollection']
 }
 
 LazyJavaClassifierType@59['AbstractList<E>'] {
     arguments = ArrayList@71[1] { TypeProjectionImpl@72 }
     classifier = JavaClassImpl@73['AbstractList']
     memberScope = SubstitutingScope@74
-    typeConstructor = LazyJavaClassTypeConstructor@23['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@21['AbstractList']
 }
 
 LazyJavaClassifierType@75['Cloneable'] {
@@ -129,161 +124,161 @@ LazyJavaClassifierType@101['E'] {
     arguments = ArrayList@102[empty]
     classifier = JavaTypeParameterImpl@103['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
-LazyJavaClassifierType@105['E'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+LazyJavaClassifierType@104['E'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaTypeParameterImpl@106['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@108['E'] {
     arguments = ArrayList@109[empty]
     classifier = JavaTypeParameterImpl@110['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
 }
 
-LazyJavaClassifierType@111['E'] {
-    arguments = ArrayList@112[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+LazyJavaClassifierType@112['E'] {
+    arguments = ArrayList@113[empty]
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@115['E'] {
     arguments = ArrayList@116[empty]
     classifier = JavaTypeParameterImpl@117['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@118['E'] {
     arguments = ArrayList@119[empty]
     classifier = JavaTypeParameterImpl@120['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@121['E'] {
     arguments = ArrayList@122[empty]
     classifier = JavaTypeParameterImpl@123['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@124['E'] {
     arguments = ArrayList@125[empty]
     classifier = JavaTypeParameterImpl@126['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@127['E'] {
     arguments = ArrayList@128[empty]
     classifier = JavaTypeParameterImpl@129['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@130['E'] {
     arguments = ArrayList@131[empty]
     classifier = JavaTypeParameterImpl@132['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@133['E'] {
     arguments = ArrayList@134[empty]
     classifier = JavaTypeParameterImpl@135['E']
     nullable = 'false': Boolean@85
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
 }
 
 LazyJavaClassifierType@136['E'] {
     arguments = ArrayList@137[empty]
-    classifier = JavaTypeParameterImpl@103['E']
+    classifier = JavaTypeParameterImpl@135['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
 }
 
 LazyJavaClassifierType@138['E'] {
     arguments = ArrayList@139[empty]
-    classifier = JavaTypeParameterImpl@110['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@140['E'] {
     arguments = ArrayList@141[empty]
-    classifier = JavaTypeParameterImpl@113['E']
+    classifier = JavaTypeParameterImpl@120['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
 LazyJavaClassifierType@142['E'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@123['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@144['E'] {
     arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@107['E']
+    classifier = JavaTypeParameterImpl@106['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@146['E'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@129['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-LazyJavaClassifierType@148['E'] {
-    arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@126['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
-}
-
-LazyJavaClassifierType@150['E'] {
-    arguments = ArrayList@151[empty]
-    classifier = JavaTypeParameterImpl@117['E']
+    classifier = JavaTypeParameterImpl@114['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
-LazyJavaClassifierType@152['E'] {
-    arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@132['E']
-    nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
-}
-
-LazyJavaClassifierType@154['E'] {
-    arguments = ArrayList@155[empty]
+LazyJavaClassifierType@148['E'] {
+    arguments = ArrayList@149[empty]
     classifier = JavaTypeParameterImpl@99['E']
     nullable = 'true': Boolean@91
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
 }
 
+LazyJavaClassifierType@150['E'] {
+    arguments = ArrayList@151[empty]
+    classifier = JavaTypeParameterImpl@110['E']
+    nullable = 'true': Boolean@91
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+}
+
+LazyJavaClassifierType@152['E'] {
+    arguments = ArrayList@153[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@120['E']
+    classifier = JavaTypeParameterImpl@117['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@158['E'] {
     arguments = ArrayList@159[empty]
-    classifier = JavaTypeParameterImpl@135['E']
+    classifier = JavaTypeParameterImpl@126['E']
     nullable = 'true': Boolean@91
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
 }
 
 LazyJavaClassifierType@60['List<E>'] {
@@ -369,9 +364,9 @@ LazyJavaPackageFragmentProvider@181 {
     packageFragments('whats.the.difference.indices': FqName@223) = null
     packageFragments('whats.the.difference.lastIndex': FqName@224) = null
     topLevelClasses(JavaClassImpl@69['AbstractCollection']) = LazyJavaClassDescriptor@3['AbstractCollection']
-    topLevelClasses(JavaClassImpl@73['AbstractList']) = LazyJavaClassDescriptor@14['AbstractList']
-    topLevelClasses(JavaClassImpl@225['ArrayList']) = LazyJavaClassDescriptor@24['ArrayList']
-    topLevelClasses(JavaClassImpl@177['RandomAccess']) = LazyJavaClassDescriptor@39['RandomAccess']
+    topLevelClasses(JavaClassImpl@73['AbstractList']) = LazyJavaClassDescriptor@12['AbstractList']
+    topLevelClasses(JavaClassImpl@225['ArrayList']) = LazyJavaClassDescriptor@22['ArrayList']
+    topLevelClasses(JavaClassImpl@177['RandomAccess']) = LazyJavaClassDescriptor@38['RandomAccess']
     topLevelClasses(JavaClassImpl@180['Serializable']) = LazyJavaClassDescriptor@43['Serializable']
 }
 
@@ -379,121 +374,389 @@ LazyJavaPackageFragment@190['java'] {
     classes('lang': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@227
     classes('util': Name@228) = null // through LazyPackageFragmentScopeForJavaPackage@227
     deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@227
-    functions('lang': Name@230) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@227
-    functions('util': Name@231) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@227
+    functions('lang': Name@230) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@227
+    functions('util': Name@231) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@227
     memberIndex = computeMemberIndex$1@232 // through LazyPackageFragmentScopeForJavaPackage@227
 }
 
 LazyJavaPackageFragment@194['lang'] {
     classes('ArrayList': Name@233) = null // through LazyPackageFragmentScopeForJavaPackage@234
     classes('IntRange': Name@235) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('add': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('get': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('hasNext': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('iarray': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('iterator': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('lastIndex': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('minus': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('next': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('rangeTo': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@234
-    classes('size': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('iarray': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('lastIndex': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@234
+    classes('size': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@234
     deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('ArrayList': Name@233) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('IntRange': Name@235) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('add': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('get': Name@236) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('hasNext': Name@237) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('iarray': Name@238) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('iterator': Name@239) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('lastIndex': Name@245) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('minus': Name@241) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('next': Name@242) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('rangeTo': Name@243) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    functions('size': Name@244) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@234
-    memberIndex = computeMemberIndex$1@246 // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('ArrayList': Name@233) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('IntRange': Name@235) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('iarray': Name@236) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('lastIndex': Name@239) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    functions('size': Name@238) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@234
+    memberIndex = computeMemberIndex$1@240 // through LazyPackageFragmentScopeForJavaPackage@234
 }
 
 LazyJavaPackageFragment@201['util'] {
-    classes('Array': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('ArrayList': Name@233) = LazyJavaClassDescriptor@24['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('Int': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('IntRange': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('String': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('add': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('get': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('hasNext': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('iarray': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('iterator': Name@239) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('lastIndex': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('minus': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('next': Name@242) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('rangeTo': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    classes('size': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@248
-    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('ArrayList': Name@233) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('IntRange': Name@235) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('add': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('get': Name@236) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('hasNext': Name@237) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('iarray': Name@238) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('iterator': Name@239) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('lastIndex': Name@245) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('minus': Name@241) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('next': Name@242) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('rangeTo': Name@243) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    functions('size': Name@244) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@248
-    memberIndex = computeMemberIndex$1@252 // through LazyPackageFragmentScopeForJavaPackage@248
+    classes('Array': Name@241) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('ArrayList': Name@233) = LazyJavaClassDescriptor@22['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('Int': Name@243) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('IntRange': Name@244) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('String': Name@245) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('iarray': Name@236) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('lastIndex': Name@237) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    classes('size': Name@238) = null // through LazyPackageFragmentScopeForJavaPackage@242
+    deserializedPackageScope = Empty@229 // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('ArrayList': Name@233) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('IntRange': Name@235) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('iarray': Name@236) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('lastIndex': Name@239) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    functions('size': Name@238) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@242
+    memberIndex = computeMemberIndex$1@246 // through LazyPackageFragmentScopeForJavaPackage@242
 }
 
 LazyJavaTypeParameterDescriptor@57['E'] {
+    defaultType = JetTypeImpl@247['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@107
+    upperBounds = LinkedHashSet@248[1] { NullableType@249 }
+    upperBoundsAsType = NullableType@249
+}
+
+LazyJavaTypeParameterDescriptor@48['E'] {
+    defaultType = JetTypeImpl@250['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@111
+    upperBounds = LinkedHashSet@251[1] { NullableType@252 }
+    upperBoundsAsType = NullableType@252
+}
+
+LazyJavaTypeParameterDescriptor@52['E'] {
     defaultType = JetTypeImpl@253['E']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@100
     upperBounds = LinkedHashSet@254[1] { NullableType@255 }
     upperBoundsAsType = NullableType@255
 }
 
-LazyJavaTypeParameterDescriptor@52['E'] {
-    defaultType = JetTypeImpl@256['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
-    upperBounds = LinkedHashSet@257[1] { NullableType@258 }
-    upperBoundsAsType = NullableType@258
+LazyJavaTypeParameterResolver@256 {
+    resolve(JavaTypeParameterImpl@257['E']) = LazyJavaTypeParameterDescriptor@57['E']
 }
 
-LazyJavaTypeParameterDescriptor@48['E'] {
-    defaultType = JetTypeImpl@259['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-    upperBounds = LinkedHashSet@260[1] { NullableType@261 }
-    upperBoundsAsType = NullableType@261
+LazyJavaTypeParameterResolver@258 {
+    resolve(JavaTypeParameterImpl@259['E']) = LazyJavaTypeParameterDescriptor@48['E']
+}
+
+LazyJavaTypeParameterResolver@260 {
+    resolve(JavaTypeParameterImpl@261['E']) = LazyJavaTypeParameterDescriptor@52['E']
 }
 
 LazyJavaTypeParameterResolver@262 {
-    resolve(JavaTypeParameterImpl@263['E']) = LazyJavaTypeParameterDescriptor@48['E']
+    resolve(JavaTypeParameterImpl@103['E']) = null
+}
+
+LazyJavaTypeParameterResolver@263 {
+    resolve(JavaTypeParameterImpl@129['E']) = null
 }
 
 LazyJavaTypeParameterResolver@264 {
-    resolve(JavaTypeParameterImpl@265['E']) = LazyJavaTypeParameterDescriptor@57['E']
-}
-
-LazyJavaTypeParameterResolver@266 {
-    resolve(JavaTypeParameterImpl@267['E']) = LazyJavaTypeParameterDescriptor@52['E']
-}
-
-LazyJavaTypeParameterResolver@268 {
     resolve(JavaTypeParameterImpl@132['E']) = null
 }
 
-LazyJavaTypeParameterResolver@269 {
-    resolve(JavaTypeParameterImpl@126['E']) = null
+LazyJavaTypeParameterResolver@265 {
+    resolve(JavaTypeParameterImpl@110['E']) = null
 }
 
-LazyJavaTypeParameterResolver@270 {
-    resolve(JavaTypeParameterImpl@113['E']) = null
+LazyJavaTypeParameterResolver@266 {
+    resolve(JavaTypeParameterImpl@99['E']) = null
 }
 
-LazyJavaTypeParameterResolver@271 {
-    resolve(JavaTypeParameterImpl@123['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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
 }
 
-LazyJavaTypeParameterResolver@272 {
-    resolve(JavaTypeParameterImpl@117['E']) = null
+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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <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@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[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 {
+    <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[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[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 }
+    <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 e4e57bde2f3..40e9a43caee 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@306['ClassLoader']
+    classifier = JavaClassImpl@309['ClassLoader']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
 }
 
 LazyJavaClassifierType@312['ClassLoader'] {
     arguments = ArrayList@313[empty]
-    classifier = JavaClassImpl@309['ClassLoader']
+    classifier = JavaClassImpl@303['ClassLoader']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
 }
 
 LazyJavaClassifierType@314['ClassLoader'] {
     arguments = ArrayList@315[empty]
-    classifier = JavaClassImpl@303['ClassLoader']
+    classifier = JavaClassImpl@306['ClassLoader']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@1['ClassLoader']
 }
@@ -316,28 +316,28 @@ LazyJavaClassifierType@332['Object'] {
 
 LazyJavaClassifierType@335['Object'] {
     arguments = ArrayList@336[empty]
-    classifier = JavaClassImpl@331['Object']
+    classifier = JavaClassImpl@334['Object']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@325
 }
 
 LazyJavaClassifierType@337['Object'] {
     arguments = ArrayList@338[empty]
-    classifier = JavaClassImpl@324['Object']
+    classifier = JavaClassImpl@328['Object']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@325
 }
 
 LazyJavaClassifierType@339['Object'] {
     arguments = ArrayList@340[empty]
-    classifier = JavaClassImpl@334['Object']
+    classifier = JavaClassImpl@331['Object']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@325
 }
 
 LazyJavaClassifierType@341['Object'] {
     arguments = ArrayList@342[empty]
-    classifier = JavaClassImpl@328['Object']
+    classifier = JavaClassImpl@324['Object']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@325
 }
@@ -416,49 +416,49 @@ LazyJavaClassifierType@369['Runnable'] {
 
 LazyJavaClassifierType@372['Runnable'] {
     arguments = ArrayList@373[empty]
-    classifier = JavaClassImpl@356['Runnable']
+    classifier = JavaClassImpl@365['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@374['Runnable'] {
     arguments = ArrayList@375[empty]
-    classifier = JavaClassImpl@368['Runnable']
+    classifier = JavaClassImpl@353['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@376['Runnable'] {
     arguments = ArrayList@377[empty]
-    classifier = JavaClassImpl@371['Runnable']
+    classifier = JavaClassImpl@359['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@378['Runnable'] {
     arguments = ArrayList@379[empty]
-    classifier = JavaClassImpl@365['Runnable']
+    classifier = JavaClassImpl@371['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@380['Runnable'] {
     arguments = ArrayList@381[empty]
-    classifier = JavaClassImpl@362['Runnable']
+    classifier = JavaClassImpl@356['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@382['Runnable'] {
     arguments = ArrayList@383[empty]
-    classifier = JavaClassImpl@353['Runnable']
+    classifier = JavaClassImpl@368['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
 
 LazyJavaClassifierType@384['Runnable'] {
     arguments = ArrayList@385[empty]
-    classifier = JavaClassImpl@359['Runnable']
+    classifier = JavaClassImpl@362['Runnable']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@88['Runnable']
 }
@@ -562,35 +562,35 @@ LazyJavaClassifierType@424['String'] {
 
 LazyJavaClassifierType@427['String'] {
     arguments = ArrayList@428[empty]
-    classifier = JavaClassImpl@414['String']
+    classifier = JavaClassImpl@423['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@429['String'] {
     arguments = ArrayList@430[empty]
-    classifier = JavaClassImpl@426['String']
+    classifier = JavaClassImpl@398['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@431['String'] {
     arguments = ArrayList@432[empty]
-    classifier = JavaClassImpl@398['String']
+    classifier = JavaClassImpl@420['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@433['String'] {
     arguments = ArrayList@434[empty]
-    classifier = JavaClassImpl@420['String']
+    classifier = JavaClassImpl@414['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@435['String'] {
     arguments = ArrayList@436[empty]
-    classifier = JavaClassImpl@423['String']
+    classifier = JavaClassImpl@411['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
@@ -604,28 +604,28 @@ LazyJavaClassifierType@437['String'] {
 
 LazyJavaClassifierType@439['String'] {
     arguments = ArrayList@440[empty]
-    classifier = JavaClassImpl@405['String']
+    classifier = JavaClassImpl@417['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@441['String'] {
     arguments = ArrayList@442[empty]
-    classifier = JavaClassImpl@411['String']
+    classifier = JavaClassImpl@405['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@443['String'] {
     arguments = ArrayList@444[empty]
-    classifier = JavaClassImpl@417['String']
+    classifier = JavaClassImpl@402['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
 
 LazyJavaClassifierType@445['String'] {
     arguments = ArrayList@446[empty]
-    classifier = JavaClassImpl@402['String']
+    classifier = JavaClassImpl@426['String']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@399
 }
@@ -761,14 +761,14 @@ LazyJavaClassifierType@494['ThreadLocalMap'] {
 
 LazyJavaClassifierType@497['ThreadLocalMap'] {
     arguments = ArrayList@498[empty]
-    classifier = JavaClassImpl@496['ThreadLocalMap']
+    classifier = JavaClassImpl@493['ThreadLocalMap']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@281['ThreadLocalMap']
 }
 
 LazyJavaClassifierType@499['ThreadLocalMap'] {
     arguments = ArrayList@500[empty]
-    classifier = JavaClassImpl@493['ThreadLocalMap']
+    classifier = JavaClassImpl@496['ThreadLocalMap']
     nullable = 'true': Boolean@300
     typeConstructor = LazyJavaClassTypeConstructor@281['ThreadLocalMap']
 }
@@ -796,21 +796,21 @@ LazyJavaClassifierType@508['Throwable'] {
 
 LazyJavaClassifierType@511['Throwable'] {
     arguments = ArrayList@512[empty]
-    classifier = JavaClassImpl@510['Throwable']
+    classifier = JavaClassImpl@503['Throwable']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@504
 }
 
 LazyJavaClassifierType@513['Throwable'] {
     arguments = ArrayList@514[empty]
-    classifier = JavaClassImpl@503['Throwable']
+    classifier = JavaClassImpl@507['Throwable']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@504
 }
 
 LazyJavaClassifierType@515['Throwable'] {
     arguments = ArrayList@516[empty]
-    classifier = JavaClassImpl@507['Throwable']
+    classifier = JavaClassImpl@510['Throwable']
     nullable = 'true': Boolean@300
     typeConstructor = DeserializedClassTypeConstructor@504
 }
@@ -838,7 +838,7 @@ LazyJavaClassifierType@523['UncaughtExceptionHandler'] {
 
 LazyJavaClassifierType@526['UncaughtExceptionHandler'] {
     arguments = ArrayList@527[empty]
-    classifier = JavaClassImpl@525['UncaughtExceptionHandler']
+    classifier = JavaClassImpl@522['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@522['UncaughtExceptionHandler']
+    classifier = JavaClassImpl@525['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@309['ClassLoader']) = LazyJavaClassDescriptor@0['ClassLoader']
+    topLevelClasses(JavaClassImpl@303['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']
@@ -898,3 +898,69 @@ LazyJavaPackageFragment@540['lang'] {
     functions('init2': Name@552) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@559
     memberIndex = computeMemberIndex$1@560 // through LazyPackageFragmentScopeForJavaPackage@559
 }
+
+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> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@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]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@576 {
+    <name not found> = ArrayList@577[1] { ResolutionCandidate@578 }
+    <name not found> = ArrayList@579[1] { ResolutionCandidate@578 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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 84f05fbe9d1..e3156a9f320 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt597.lazy.log
@@ -86,32 +86,131 @@ LazyJavaPackageFragment@37['<root>'] {
     classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('NullPointerException': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
     classes('equals': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('get': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('inc': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('NullPointerException': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('equals': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('get': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    functions('inc': Name@61) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('inc': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('NullPointerException': Name@58) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('equals': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('inc': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
 LazyJavaPackageFragment@42['java'] {
-    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('lang': Name@67) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('lang': Name@66) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
 }
 
 LazyJavaPackageFragment@44['lang'] {
-    classes('NullPointerException': Name@58) = LazyJavaClassDescriptor@2['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('equals': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('get': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    classes('inc': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('NullPointerException': Name@58) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('equals': Name@59) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('get': Name@60) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('inc': Name@61) = EmptyList@63[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('NullPointerException': Name@58) = LazyJavaClassDescriptor@2['NullPointerException'] // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('equals': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('inc': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('NullPointerException': Name@58) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('equals': Name@59) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('inc': Name@60) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+}
+
+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> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[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 }
+    <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]
+    <name not found> = EmptyList@62[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[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[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]
+    <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@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]
+    <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@117 {
+    <name not found> = ArrayList@118[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
+    <name not found> = ArrayList@121[2] { ResolutionCandidate@119, ResolutionCandidate@120 }
+}
+
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
+    <name not found> = ArrayList@126[2] { ResolutionCandidate@124, ResolutionCandidate@125 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
index 04c4f366b06..86389859288 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt600.lazy.log
@@ -115,3 +115,54 @@ LazyJavaPackageFragment@46['lang'] {
     functions('equals': Name@62) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@70
     memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
 }
+
+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> = 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]
+    <name not found> = EmptyList@64[empty]
+    <name not found> = EmptyList@64[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[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+}
+
+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]
+    <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/regressions/kt604.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
index c857dbe9fd5..1d5ad8626e5 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt604.lazy.log
@@ -47,3 +47,75 @@ LazyJavaPackageFragment@11['lang'] {
     functions('invoke': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@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@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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> = 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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
index 079dfc28fca..0627ffda1fa 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt618.lazy.log
@@ -30,26 +30,330 @@ LazyJavaPackageFragment@7['java'] {
 LazyJavaPackageFragment@9['lang'] {
     classes('B': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
     classes('div': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('divAssign': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('minus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('minusAssign': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('mod': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('modAssign': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plus': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('plusAssign': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('times': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    classes('timesAssign': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('minus': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('mod': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('plus': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('times': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@30
     deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
     functions('B': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     functions('div': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('divAssign': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('minus': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('minusAssign': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('mod': Name@35) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('modAssign': Name@36) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plus': Name@37) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('plusAssign': Name@38) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('times': Name@39) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('timesAssign': Name@40) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('minus': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('mod': Name@33) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('plus': Name@34) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    functions('times': Name@35) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@30
+}
+
+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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 {
+    <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]
+}
+
+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]
+}
+
+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]
+    <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 }
+    <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]
+    <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]
+    <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> = 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 }
+    <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@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 }
+}
+
+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[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@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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@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]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 355b573cdca..1b681f1f322 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt629.lazy.log
@@ -29,13 +29,149 @@ LazyJavaPackageFragment@8['java'] {
 
 LazyJavaPackageFragment@10['lang'] {
     classes('A': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('mod': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('modAssign': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('modAssign': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
     functions('A': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('mod': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('modAssign': Name@31) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('modAssign': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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]
+    <name not found> = EmptyList@25[empty]
+    <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> = 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]
+    <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 }
+    <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> = 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@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 }
+}
+
+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> = 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> = 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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 0fed9fa00f3..e29fc472d59 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt630.lazy.log
@@ -48,3 +48,24 @@ LazyJavaPackageFragment@11['lang'] {
     functions('sure': Name@26) = 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@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@45 {
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@47 }
+    <name not found> = ArrayList@48[1] { ResolutionCandidate@47 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
index 421759fa9dc..7cafdf225ee 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt688.lazy.log
@@ -20,36 +20,123 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
     classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('b': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('x': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('B': Name@20) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('a': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('b': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('x': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@21
+    classes('x': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('B': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('a': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('x': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('b': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('x': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('B': Name@20) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('a': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('b': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('x': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('B': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('a': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('x': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('B': Name@20) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('a': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('x': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+    <name not found> = EmptyList@25[empty]
+    <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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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> = ArrayList@44[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]
+}
+
+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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
index 1f0948c2d7c..73a5ad1ef2d 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt701.lazy.log
@@ -2,22 +2,18 @@ LazyJavaClassDescriptor@0['AnnotatedElement'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@5 // through LazyJavaClassMemberScope@3
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
 }
 
-LazyJavaClassDescriptor@9['Class'] {
-    defaultType = JetTypeImpl@10['Class<1>']
-    enumEntryIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@12
-    functions('cast': Name@6) = ArrayList@13[1] { JavaMethodDescriptor@14['cast'] } // through LazyJavaClassMemberScope@12
-    functions('isInstance': Name@7) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@12
-    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@12
-    nestedClasses('cast': Name@6) = null // through LazyJavaClassMemberScope@12
-    nestedClasses('isInstance': Name@7) = null // through LazyJavaClassMemberScope@12
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
+LazyJavaClassDescriptor@7['Class'] {
+    defaultType = JetTypeImpl@8['Class<1>']
+    enumEntryIndex = LinkedHashMap@9 // through LazyJavaClassMemberScope@10
+    functions('cast': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['cast'] } // through LazyJavaClassMemberScope@10
+    functions('isInstance': Name@14) = ArrayList@15[1] { JavaMethodDescriptor@16['isInstance'] } // through LazyJavaClassMemberScope@10
+    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@10
+    nestedClassIndex = LinkedHashMap@18 // through LazyJavaClassMemberScope@10
+    nestedClasses('cast': Name@11) = null // through LazyJavaClassMemberScope@10
+    nestedClasses('isInstance': Name@14) = null // through LazyJavaClassMemberScope@10
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@20['Class']
 }
@@ -34,8 +30,6 @@ LazyJavaClassDescriptor@25['GenericDeclaration'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@26
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@26
     typeConstructor = LazyJavaClassTypeConstructor@28['GenericDeclaration']
 }
 
@@ -47,8 +41,6 @@ LazyJavaClassDescriptor@31['Serializable'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
     memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
     typeConstructor = LazyJavaClassTypeConstructor@34['Serializable']
 }
 
@@ -56,12 +48,10 @@ LazyJavaClassDescriptor@35['Type'] {
     functions('cast': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
     functions('isInstance': Name@4) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
     memberIndex = computeMemberIndex$1@37 // through LazyJavaClassMemberScope@36
-    properties('cast': Name@6) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
-    properties('isInstance': Name@7) = EmptyList@2[empty] // through LazyJavaClassMemberScope@36
     typeConstructor = LazyJavaClassTypeConstructor@38['Type']
 }
 
-LazyJavaClassTypeConstructor@8['AnnotatedElement'] {
+LazyJavaClassTypeConstructor@6['AnnotatedElement'] {
     parameters = ArrayList@39[empty]
     supertypes = ArrayList@40[1] { JetTypeImpl@41['Any'] }
 }
@@ -105,7 +95,7 @@ LazyJavaClassifierType@63['AnnotatedElement'] {
     arguments = ArrayList@64[empty]
     classifier = JavaClassImpl@65['AnnotatedElement']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@8['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@6['AnnotatedElement']
 }
 
 LazyJavaClassifierType@58['Exception'] {
@@ -199,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
@@ -247,7 +237,7 @@ LazyJavaPackageFragmentProvider@109 {
     packageFragments('kotlin.io': FqName@140) = null
     packageFragments('kotlin.jvm': FqName@141) = null
     topLevelClasses(JavaClassImpl@65['AnnotatedElement']) = LazyJavaClassDescriptor@0['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@142['Class']) = LazyJavaClassDescriptor@9['Class']
+    topLevelClasses(JavaClassImpl@142['Class']) = LazyJavaClassDescriptor@7['Class']
     topLevelClasses(JavaClassImpl@143['Error']) = LazyJavaClassDescriptor@21['Error']
     topLevelClasses(JavaClassImpl@67['Exception']) = LazyJavaClassDescriptor@23['Exception']
     topLevelClasses(JavaClassImpl@69['GenericDeclaration']) = LazyJavaClassDescriptor@25['GenericDeclaration']
@@ -261,17 +251,13 @@ LazyJavaPackageFragment@111['<root>'] {
     classes('Error': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@146
     classes('RuntimeException': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@146
     classes('Throwable': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('cast': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@146
     classes('equals': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@146
     classes('getJavaClass': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('isInstance': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@146
     classes('java': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@146
     classes('propagateIfInstanceOf': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@146
     deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('cast': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
     functions('equals': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
     functions('getJavaClass': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('isInstance': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
     functions('propagateIfInstanceOf': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@146
     memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@146
 }
@@ -284,20 +270,16 @@ LazyJavaPackageFragment@120['java'] {
 }
 
 LazyJavaPackageFragment@124['lang'] {
-    classes('Class': Name@160) = LazyJavaClassDescriptor@9['Class'] // through LazyPackageFragmentScopeForJavaPackage@161
+    classes('Class': Name@160) = LazyJavaClassDescriptor@7['Class'] // through LazyPackageFragmentScopeForJavaPackage@161
     classes('Error': Name@147) = LazyJavaClassDescriptor@21['Error'] // through LazyPackageFragmentScopeForJavaPackage@161
     classes('RuntimeException': Name@148) = LazyJavaClassDescriptor@29['RuntimeException'] // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('cast': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('equals': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('getJavaClass': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('isInstance': Name@7) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('java': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('propagateIfInstanceOf': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@161
     deserializedPackageScope = Empty@154 // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('cast': Name@6) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     functions('equals': Name@150) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     functions('getJavaClass': Name@151) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('isInstance': Name@7) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     functions('propagateIfInstanceOf': Name@153) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@161
 }
@@ -315,3 +297,171 @@ LazyJavaTypeParameterResolver@166 {
 LazyJavaTypeParameterResolver@168 {
     resolve(JavaTypeParameterImpl@98['T']) = null
 }
+
+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> = 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@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]
+    <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@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]
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
index b6b32e6705b..450f39840d4 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt716.lazy.log
@@ -9,412 +9,457 @@ LazyJavaClassDescriptor@2['AnnotatedElement'] {
 LazyJavaClassDescriptor@4['Appendable'] {
     functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
     memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
-LazyJavaClassDescriptor@11['AutoCloseable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
+LazyJavaClassDescriptor@10['AutoCloseable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@15['Class'] {
-    defaultType = JetTypeImpl@16['Class<1>']
-    typeConstructor = LazyJavaClassTypeConstructor@17['Class']
+LazyJavaClassDescriptor@14['Class'] {
+    defaultType = JetTypeImpl@15['Class<1>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['Class']
 }
 
-LazyJavaClassDescriptor@18['Closeable'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
-    memberIndex = computeMemberIndex$1@20 // through LazyJavaClassMemberScope@19
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+LazyJavaClassDescriptor@17['Closeable'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@18
+    memberIndex = computeMemberIndex$1@19 // through LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
-LazyJavaClassDescriptor@22['FilterOutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
-    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
+LazyJavaClassDescriptor@21['FilterOutputStream'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@22
+    memberIndex = computeMemberIndex$1@23 // through LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@26['GenericDeclaration'] {
-    typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
+LazyJavaClassDescriptor@25['GenericDeclaration'] {
+    typeConstructor = LazyJavaClassTypeConstructor@26['GenericDeclaration']
 }
 
-LazyJavaClassDescriptor@28['Object'] {
-    defaultType = JetTypeImpl@29['Object']
-    enumEntryIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@31
-    functions('getClass': Name@32) = ArrayList@33[1] { JavaMethodDescriptor@34['getClass'] } // through LazyJavaClassMemberScope@31
-    memberIndex = computeMemberIndex$1@35 // through LazyJavaClassMemberScope@31
-    nestedClassIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@31
-    nestedClasses('getClass': Name@32) = null // through LazyJavaClassMemberScope@31
-    nestedClasses('t': Name@37) = null // through LazyJavaClassMemberScope@31
-    properties('getClass': Name@32) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
-    properties('t': Name@37) = EmptyList@6[empty] // through LazyJavaClassMemberScope@31
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@38['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@39['Object']
+LazyJavaClassDescriptor@27['Object'] {
+    defaultType = JetTypeImpl@28['Object']
+    enumEntryIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@30
+    functions('getClass': Name@31) = ArrayList@32[1] { JavaMethodDescriptor@33['getClass'] } // through LazyJavaClassMemberScope@30
+    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@30
+    nestedClassIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@30
+    nestedClasses('getClass': Name@31) = null // through LazyJavaClassMemberScope@30
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@37['Object']
 }
 
-LazyJavaClassDescriptor@40['OutputStream'] {
-    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
-    memberIndex = computeMemberIndex$1@42 // through LazyJavaClassMemberScope@41
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['OutputStream']
+LazyJavaClassDescriptor@38['OutputStream'] {
+    functions('println': Name@5) = EmptyList@6[empty] // through LazyJavaClassMemberScope@39
+    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
+    typeConstructor = LazyJavaClassTypeConstructor@41['OutputStream']
 }
 
-LazyJavaClassDescriptor@44['PrintStream'] {
-    defaultType = JetTypeImpl@45['PrintStream']
-    enumEntryIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@47
-    functions('println': Name@9) = ArrayList@48[10] { JavaMethodDescriptor@49['println'], JavaMethodDescriptor@50['println'], JavaMethodDescriptor@51['println'], ... } // through LazyJavaClassMemberScope@47
-    memberIndex = computeMemberIndex$1@52 // through LazyJavaClassMemberScope@47
-    nestedClassIndex = LinkedHashMap@53 // through LazyJavaClassMemberScope@47
-    nestedClasses('println': Name@9) = null // through LazyJavaClassMemberScope@47
-    properties('println': Name@9) = EmptyList@6[empty] // through LazyJavaClassMemberScope@47
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@54['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@55['PrintStream']
+LazyJavaClassDescriptor@42['PrintStream'] {
+    defaultType = JetTypeImpl@43['PrintStream']
+    enumEntryIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@45
+    functions('println': Name@46) = ArrayList@47[10] { JavaMethodDescriptor@48['println'], JavaMethodDescriptor@49['println'], JavaMethodDescriptor@50['println'], ... } // through LazyJavaClassMemberScope@45
+    memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@45
+    nestedClassIndex = LinkedHashMap@52 // through LazyJavaClassMemberScope@45
+    nestedClasses('println': Name@46) = null // through LazyJavaClassMemberScope@45
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@53['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@54['PrintStream']
 }
 
-LazyJavaClassDescriptor@56['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@57['Serializable']
+LazyJavaClassDescriptor@55['Serializable'] {
+    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
 }
 
-LazyJavaClassDescriptor@58['System'] {
-    enumEntryIndex = LinkedHashMap@59 // through LazyJavaClassMemberScope@60
-    memberIndex = computeMemberIndex$1@61 // through LazyJavaClassMemberScope@60
-    memberIndex = computeMemberIndex$1@62 // through LazyJavaStaticClassScope@63
-    nestedClassIndex = LinkedHashMap@64 // through LazyJavaClassMemberScope@60
-    nestedClasses('out': Name@65) = null // through LazyJavaClassMemberScope@60
-    properties('out': Name@65) = ArrayList@66[1] { JavaPropertyDescriptor@67['out'] } // through LazyJavaStaticClassScope@63
-    properties('out': Name@65) = EmptyList@6[empty] // through LazyJavaClassMemberScope@60
-    typeConstructor = LazyJavaClassTypeConstructor@68['System']
+LazyJavaClassDescriptor@57['System'] {
+    enumEntryIndex = LinkedHashMap@58 // through LazyJavaClassMemberScope@59
+    memberIndex = computeMemberIndex$1@60 // through LazyJavaClassMemberScope@59
+    memberIndex = computeMemberIndex$1@61 // through LazyJavaStaticClassScope@62
+    nestedClassIndex = LinkedHashMap@63 // through LazyJavaClassMemberScope@59
+    nestedClasses('out': Name@64) = null // through LazyJavaClassMemberScope@59
+    properties('out': Name@64) = ArrayList@65[1] { JavaPropertyDescriptor@66['out'] } // through LazyJavaStaticClassScope@62
+    properties('out': Name@64) = EmptyList@6[empty] // through LazyJavaClassMemberScope@59
+    typeConstructor = LazyJavaClassTypeConstructor@67['System']
 }
 
-LazyJavaClassDescriptor@69['Type'] {
-    typeConstructor = LazyJavaClassTypeConstructor@70['Type']
+LazyJavaClassDescriptor@68['Type'] {
+    typeConstructor = LazyJavaClassTypeConstructor@69['Type']
 }
 
 LazyJavaClassTypeConstructor@3['AnnotatedElement'] {
-    supertypes = ArrayList@71[1] { JetTypeImpl@72['Any'] }
+    supertypes = ArrayList@70[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassTypeConstructor@10['Appendable'] {
-    parameters = ArrayList@73[empty]
-    supertypes = ArrayList@74[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@9['Appendable'] {
+    parameters = ArrayList@72[empty]
+    supertypes = ArrayList@73[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['AutoCloseable'] {
-    parameters = ArrayList@75[empty]
-    supertypes = ArrayList@76[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@13['AutoCloseable'] {
+    parameters = ArrayList@74[empty]
+    supertypes = ArrayList@75[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassTypeConstructor@17['Class'] {
-    parameters = ArrayList@77[1] { LazyJavaTypeParameterDescriptor@78['T'] }
-    supertypes = ArrayList@79[4] { LazyJavaClassifierType@80['Serializable'], LazyJavaClassifierType@81['GenericDeclaration'], LazyJavaClassifierType@82['Type'], ... }
+LazyJavaClassTypeConstructor@16['Class'] {
+    parameters = ArrayList@76[1] { LazyJavaTypeParameterDescriptor@77['T'] }
+    supertypes = ArrayList@78[4] { LazyJavaClassifierType@79['Serializable'], LazyJavaClassifierType@80['GenericDeclaration'], LazyJavaClassifierType@81['Type'], ... }
 }
 
-LazyJavaClassTypeConstructor@21['Closeable'] {
-    parameters = ArrayList@83[empty]
-    supertypes = ArrayList@84[1] { LazyJavaClassifierType@85['AutoCloseable'] }
+LazyJavaClassTypeConstructor@20['Closeable'] {
+    parameters = ArrayList@82[empty]
+    supertypes = ArrayList@83[1] { LazyJavaClassifierType@84['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@25['FilterOutputStream'] {
-    parameters = ArrayList@86[empty]
-    supertypes = ArrayList@87[1] { LazyJavaClassifierType@88['OutputStream'] }
+LazyJavaClassTypeConstructor@24['FilterOutputStream'] {
+    parameters = ArrayList@85[empty]
+    supertypes = ArrayList@86[1] { LazyJavaClassifierType@87['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@27['GenericDeclaration'] {
-    supertypes = ArrayList@89[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@26['GenericDeclaration'] {
+    supertypes = ArrayList@88[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassTypeConstructor@39['Object'] {
-    parameters = ArrayList@90[empty]
-    supertypes = ArrayList@91[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@37['Object'] {
+    parameters = ArrayList@89[empty]
+    supertypes = ArrayList@90[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassTypeConstructor@43['OutputStream'] {
-    parameters = ArrayList@92[empty]
-    supertypes = ArrayList@93[1] { LazyJavaClassifierType@94['Closeable'] }
+LazyJavaClassTypeConstructor@41['OutputStream'] {
+    parameters = ArrayList@91[empty]
+    supertypes = ArrayList@92[1] { LazyJavaClassifierType@93['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@55['PrintStream'] {
-    parameters = ArrayList@95[empty]
-    supertypes = ArrayList@96[3] { LazyJavaClassifierType@97['FilterOutputStream'], LazyJavaClassifierType@98['Appendable'], LazyJavaClassifierType@99['Closeable'] }
+LazyJavaClassTypeConstructor@54['PrintStream'] {
+    parameters = ArrayList@94[empty]
+    supertypes = ArrayList@95[3] { LazyJavaClassifierType@96['FilterOutputStream'], LazyJavaClassifierType@97['Appendable'], LazyJavaClassifierType@98['Closeable'] }
 }
 
-LazyJavaClassTypeConstructor@57['Serializable'] {
-    parameters = ArrayList@100[empty]
-    supertypes = ArrayList@101[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@56['Serializable'] {
+    parameters = ArrayList@99[empty]
+    supertypes = ArrayList@100[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassTypeConstructor@68['System'] {
-    supertypes = ArrayList@102[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@67['System'] {
+    supertypes = ArrayList@101[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassTypeConstructor@70['Type'] {
-    supertypes = ArrayList@103[1] { JetTypeImpl@72['Any'] }
+LazyJavaClassTypeConstructor@69['Type'] {
+    supertypes = ArrayList@102[1] { JetTypeImpl@71['Any'] }
 }
 
-LazyJavaClassifierType@104['AnnotatedElement'] {
-    classifier = JavaClassImpl@105['AnnotatedElement']
+LazyJavaClassifierType@103['AnnotatedElement'] {
+    classifier = JavaClassImpl@104['AnnotatedElement']
     typeConstructor = LazyJavaClassTypeConstructor@3['AnnotatedElement']
 }
 
-LazyJavaClassifierType@98['Appendable'] {
-    arguments = ArrayList@106[empty]
-    classifier = JavaClassImpl@107['Appendable']
+LazyJavaClassifierType@97['Appendable'] {
+    arguments = ArrayList@105[empty]
+    classifier = JavaClassImpl@106['Appendable']
     memberScope = LazyJavaClassMemberScope@7
-    typeConstructor = LazyJavaClassTypeConstructor@10['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@9['Appendable']
 }
 
-LazyJavaClassifierType@85['AutoCloseable'] {
-    arguments = ArrayList@108[empty]
-    classifier = JavaClassImpl@109['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['AutoCloseable']
+LazyJavaClassifierType@84['AutoCloseable'] {
+    arguments = ArrayList@107[empty]
+    classifier = JavaClassImpl@108['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['AutoCloseable']
 }
 
-LazyJavaClassifierType@110['Class<?>'] {
-    arguments = ArrayList@111[1] { LazyStarProjection@112 }
-    classifier = JavaClassImpl@113['Class']
-    nullable = 'false': Boolean@114
-    typeConstructor = LazyJavaClassTypeConstructor@17['Class']
+LazyJavaClassifierType@109['Class<?>'] {
+    arguments = ArrayList@110[1] { LazyStarProjection@111 }
+    classifier = JavaClassImpl@112['Class']
+    nullable = 'false': Boolean@113
+    typeConstructor = LazyJavaClassTypeConstructor@16['Class']
 }
 
-LazyJavaClassifierType@115['Class<?>'] {
-    arguments = ArrayList@116[1] { LazyStarProjection@117 }
-    classifier = JavaClassImpl@113['Class']
-    nullable = 'true': Boolean@118
-    typeConstructor = LazyJavaClassTypeConstructor@17['Class']
+LazyJavaClassifierType@114['Class<?>'] {
+    arguments = ArrayList@115[1] { LazyStarProjection@116 }
+    classifier = JavaClassImpl@112['Class']
+    nullable = 'true': Boolean@117
+    typeConstructor = LazyJavaClassTypeConstructor@16['Class']
 }
 
-LazyJavaClassifierType@99['Closeable'] {
-    arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@120['Closeable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+LazyJavaClassifierType@93['Closeable'] {
+    arguments = ArrayList@118[empty]
+    classifier = JavaClassImpl@119['Closeable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
-LazyJavaClassifierType@94['Closeable'] {
-    arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@122['Closeable']
-    memberScope = LazyJavaClassMemberScope@19
-    typeConstructor = LazyJavaClassTypeConstructor@21['Closeable']
+LazyJavaClassifierType@98['Closeable'] {
+    arguments = ArrayList@120[empty]
+    classifier = JavaClassImpl@121['Closeable']
+    memberScope = LazyJavaClassMemberScope@18
+    typeConstructor = LazyJavaClassTypeConstructor@20['Closeable']
 }
 
-LazyJavaClassifierType@97['FilterOutputStream'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@124['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@23
-    typeConstructor = LazyJavaClassTypeConstructor@25['FilterOutputStream']
+LazyJavaClassifierType@96['FilterOutputStream'] {
+    arguments = ArrayList@122[empty]
+    classifier = JavaClassImpl@123['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@22
+    typeConstructor = LazyJavaClassTypeConstructor@24['FilterOutputStream']
 }
 
-LazyJavaClassifierType@125['Flushable'] {
+LazyJavaClassifierType@124['Flushable'] {
     classifier = null
-    typeConstructor = TypeConstructorImpl$1@126
+    typeConstructor = TypeConstructorImpl$1@125
 }
 
-LazyJavaClassifierType@81['GenericDeclaration'] {
-    classifier = JavaClassImpl@127['GenericDeclaration']
-    typeConstructor = LazyJavaClassTypeConstructor@27['GenericDeclaration']
+LazyJavaClassifierType@80['GenericDeclaration'] {
+    classifier = JavaClassImpl@126['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@26['GenericDeclaration']
 }
 
-LazyJavaClassifierType@128['Object'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaClassImpl@130['Object']
-    nullable = 'false': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@127['Object'] {
+    arguments = ArrayList@128[empty]
+    classifier = JavaClassImpl@129['Object']
+    nullable = 'false': Boolean@113
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@132['Object'] {
-    arguments = ArrayList@133[empty]
-    classifier = JavaClassImpl@130['Object']
-    nullable = 'true': Boolean@118
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@131['Object'] {
+    arguments = ArrayList@132[empty]
+    classifier = JavaClassImpl@129['Object']
+    nullable = 'true': Boolean@117
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@134['Object'] {
-    classifier = JavaClassImpl@135['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@133['Object'] {
+    classifier = JavaClassImpl@134['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@136['Object'] {
-    classifier = JavaClassImpl@137['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@135['Object'] {
+    classifier = JavaClassImpl@136['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@138['Object'] {
-    classifier = JavaClassImpl@139['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@137['Object'] {
+    classifier = JavaClassImpl@138['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@140['Object'] {
-    classifier = JavaClassImpl@141['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@139['Object'] {
+    classifier = JavaClassImpl@140['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@142['Object'] {
-    classifier = JavaClassImpl@143['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@141['Object'] {
+    classifier = JavaClassImpl@142['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@144['Object'] {
-    classifier = JavaClassImpl@145['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@143['Object'] {
+    classifier = JavaClassImpl@144['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@146['Object'] {
-    classifier = JavaClassImpl@147['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@145['Object'] {
+    classifier = JavaClassImpl@146['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@148['Object'] {
-    classifier = JavaClassImpl@149['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@147['Object'] {
+    classifier = JavaClassImpl@148['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@150['Object'] {
-    classifier = JavaClassImpl@151['Object']
-    typeConstructor = DeserializedClassTypeConstructor@131
+LazyJavaClassifierType@149['Object'] {
+    classifier = JavaClassImpl@150['Object']
+    typeConstructor = DeserializedClassTypeConstructor@130
 }
 
-LazyJavaClassifierType@88['OutputStream'] {
-    arguments = ArrayList@152[empty]
-    classifier = JavaClassImpl@153['OutputStream']
-    memberScope = LazyJavaClassMemberScope@41
-    typeConstructor = LazyJavaClassTypeConstructor@43['OutputStream']
+LazyJavaClassifierType@87['OutputStream'] {
+    arguments = ArrayList@151[empty]
+    classifier = JavaClassImpl@152['OutputStream']
+    memberScope = LazyJavaClassMemberScope@39
+    typeConstructor = LazyJavaClassTypeConstructor@41['OutputStream']
 }
 
-LazyJavaClassifierType@154['PrintStream'] {
-    arguments = ArrayList@155[empty]
-    classifier = JavaClassImpl@156['PrintStream']
-    memberScope = LazyJavaClassMemberScope@47
-    nullable = 'false': Boolean@114
-    typeConstructor = LazyJavaClassTypeConstructor@55['PrintStream']
+LazyJavaClassifierType@153['PrintStream'] {
+    arguments = ArrayList@154[empty]
+    classifier = JavaClassImpl@155['PrintStream']
+    memberScope = LazyJavaClassMemberScope@45
+    nullable = 'false': Boolean@113
+    typeConstructor = LazyJavaClassTypeConstructor@54['PrintStream']
 }
 
-LazyJavaClassifierType@157['PrintStream'] {
+LazyJavaClassifierType@156['PrintStream'] {
+    arguments = ArrayList@157[empty]
+    classifier = JavaClassImpl@155['PrintStream']
+    nullable = 'true': Boolean@117
+    typeConstructor = LazyJavaClassTypeConstructor@54['PrintStream']
+}
+
+LazyJavaClassifierType@79['Serializable'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@156['PrintStream']
-    nullable = 'true': Boolean@118
-    typeConstructor = LazyJavaClassTypeConstructor@55['PrintStream']
+    classifier = JavaClassImpl@159['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@56['Serializable']
 }
 
-LazyJavaClassifierType@80['Serializable'] {
-    arguments = ArrayList@159[empty]
-    classifier = JavaClassImpl@160['Serializable']
-    typeConstructor = LazyJavaClassTypeConstructor@57['Serializable']
+LazyJavaClassifierType@160['String'] {
+    arguments = ArrayList@161[empty]
+    classifier = JavaClassImpl@162['String']
+    nullable = 'false': Boolean@113
+    typeConstructor = DeserializedClassTypeConstructor@163
 }
 
-LazyJavaClassifierType@161['String'] {
-    arguments = ArrayList@162[empty]
-    classifier = JavaClassImpl@163['String']
-    nullable = 'false': Boolean@114
-    typeConstructor = DeserializedClassTypeConstructor@164
+LazyJavaClassifierType@164['String'] {
+    arguments = ArrayList@165[empty]
+    classifier = JavaClassImpl@162['String']
+    nullable = 'true': Boolean@117
+    typeConstructor = DeserializedClassTypeConstructor@163
 }
 
-LazyJavaClassifierType@165['String'] {
-    arguments = ArrayList@166[empty]
-    classifier = JavaClassImpl@163['String']
-    nullable = 'true': Boolean@118
-    typeConstructor = DeserializedClassTypeConstructor@164
+LazyJavaClassifierType@81['Type'] {
+    classifier = JavaClassImpl@166['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@69['Type']
 }
 
-LazyJavaClassifierType@82['Type'] {
-    classifier = JavaClassImpl@167['Type']
-    typeConstructor = LazyJavaClassTypeConstructor@70['Type']
+LazyJavaPackageFragmentProvider@167 {
+    packageFragments('<root>': FqName@168) = LazyJavaPackageFragment@169['<root>']
+    packageFragments('Array': FqName@170) = null
+    packageFragments('String': FqName@171) = null
+    packageFragments('System': FqName@172) = null
+    packageFragments('T': FqName@173) = null
+    packageFragments('TypeInfo': FqName@174) = null
+    packageFragments('java': FqName@175) = LazyJavaPackageFragment@176['java']
+    packageFragments('java.io': FqName@177) = LazyJavaPackageFragment@178['io']
+    packageFragments('java.lang': FqName@179) = LazyJavaPackageFragment@180['lang']
+    packageFragments('java.lang.Array': FqName@181) = null
+    packageFragments('java.lang.Class': FqName@182) = null
+    packageFragments('java.lang.Object': FqName@183) = null
+    packageFragments('java.lang.String': FqName@184) = null
+    packageFragments('java.lang.System': FqName@185) = null
+    packageFragments('java.lang.T': FqName@186) = null
+    packageFragments('java.lang.TypeInfo': FqName@187) = null
+    packageFragments('java.lang.reflect': FqName@188) = LazyJavaPackageFragment@189['reflect']
+    packageFragments('kotlin': FqName@190) = null
+    packageFragments('kotlin.Array': FqName@191) = null
+    packageFragments('kotlin.String': FqName@192) = null
+    packageFragments('kotlin.System': FqName@193) = null
+    packageFragments('kotlin.T': FqName@194) = null
+    packageFragments('kotlin.TypeInfo': FqName@195) = null
+    packageFragments('kotlin.io': FqName@196) = null
+    packageFragments('kotlin.jvm': FqName@197) = null
+    topLevelClasses(JavaClassImpl@104['AnnotatedElement']) = LazyJavaClassDescriptor@2['AnnotatedElement']
+    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@123['FilterOutputStream']) = LazyJavaClassDescriptor@21['FilterOutputStream']
+    topLevelClasses(JavaClassImpl@126['GenericDeclaration']) = LazyJavaClassDescriptor@25['GenericDeclaration']
+    topLevelClasses(JavaClassImpl@199['Object']) = LazyJavaClassDescriptor@27['Object']
+    topLevelClasses(JavaClassImpl@152['OutputStream']) = LazyJavaClassDescriptor@38['OutputStream']
+    topLevelClasses(JavaClassImpl@155['PrintStream']) = LazyJavaClassDescriptor@42['PrintStream']
+    topLevelClasses(JavaClassImpl@159['Serializable']) = LazyJavaClassDescriptor@55['Serializable']
+    topLevelClasses(JavaClassImpl@200['System']) = LazyJavaClassDescriptor@57['System']
+    topLevelClasses(JavaClassImpl@166['Type']) = LazyJavaClassDescriptor@68['Type']
 }
 
-LazyJavaPackageFragmentProvider@168 {
-    packageFragments('<root>': FqName@169) = LazyJavaPackageFragment@170['<root>']
-    packageFragments('Array': FqName@171) = null
-    packageFragments('String': FqName@172) = null
-    packageFragments('System': FqName@173) = null
-    packageFragments('T': FqName@174) = null
-    packageFragments('TypeInfo': FqName@175) = null
-    packageFragments('java': FqName@176) = LazyJavaPackageFragment@177['java']
-    packageFragments('java.io': FqName@178) = LazyJavaPackageFragment@179['io']
-    packageFragments('java.lang': FqName@180) = LazyJavaPackageFragment@181['lang']
-    packageFragments('java.lang.Array': FqName@182) = null
-    packageFragments('java.lang.Class': FqName@183) = null
-    packageFragments('java.lang.Object': FqName@184) = null
-    packageFragments('java.lang.String': FqName@185) = null
-    packageFragments('java.lang.System': FqName@186) = null
-    packageFragments('java.lang.T': FqName@187) = null
-    packageFragments('java.lang.TypeInfo': FqName@188) = null
-    packageFragments('java.lang.reflect': FqName@189) = LazyJavaPackageFragment@190['reflect']
-    packageFragments('kotlin': FqName@191) = null
-    packageFragments('kotlin.Array': FqName@192) = null
-    packageFragments('kotlin.String': FqName@193) = null
-    packageFragments('kotlin.System': FqName@194) = null
-    packageFragments('kotlin.T': FqName@195) = null
-    packageFragments('kotlin.TypeInfo': FqName@196) = null
-    packageFragments('kotlin.io': FqName@197) = null
-    packageFragments('kotlin.jvm': FqName@198) = null
-    topLevelClasses(JavaClassImpl@105['AnnotatedElement']) = LazyJavaClassDescriptor@2['AnnotatedElement']
-    topLevelClasses(JavaClassImpl@107['Appendable']) = LazyJavaClassDescriptor@4['Appendable']
-    topLevelClasses(JavaClassImpl@109['AutoCloseable']) = LazyJavaClassDescriptor@11['AutoCloseable']
-    topLevelClasses(JavaClassImpl@199['Class']) = LazyJavaClassDescriptor@15['Class']
-    topLevelClasses(JavaClassImpl@120['Closeable']) = LazyJavaClassDescriptor@18['Closeable']
-    topLevelClasses(JavaClassImpl@124['FilterOutputStream']) = LazyJavaClassDescriptor@22['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@127['GenericDeclaration']) = LazyJavaClassDescriptor@26['GenericDeclaration']
-    topLevelClasses(JavaClassImpl@200['Object']) = LazyJavaClassDescriptor@28['Object']
-    topLevelClasses(JavaClassImpl@153['OutputStream']) = LazyJavaClassDescriptor@40['OutputStream']
-    topLevelClasses(JavaClassImpl@156['PrintStream']) = LazyJavaClassDescriptor@44['PrintStream']
-    topLevelClasses(JavaClassImpl@160['Serializable']) = LazyJavaClassDescriptor@56['Serializable']
-    topLevelClasses(JavaClassImpl@201['System']) = LazyJavaClassDescriptor@58['System']
-    topLevelClasses(JavaClassImpl@167['Type']) = LazyJavaClassDescriptor@69['Type']
+LazyJavaPackageFragment@169['<root>'] {
+    classes('Array': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('String': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('System': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('getJavaClass': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('java': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('typeinfo': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@202
+    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('getJavaClass': Name@205) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    functions('typeinfo': Name@207) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@202
+    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@202
 }
 
-LazyJavaPackageFragment@170['<root>'] {
-    classes('Array': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('String': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('System': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('getClass': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('getJavaClass': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('java': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    classes('typeinfo': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@203
-    deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('getClass': Name@32) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('getJavaClass': Name@206) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    functions('typeinfo': Name@208) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@203
-    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@203
+LazyJavaPackageFragment@176['java'] {
+    classes('lang': Name@210) = null // through LazyPackageFragmentScopeForJavaPackage@211
+    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@211
+    functions('lang': Name@212) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@211
+    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@211
 }
 
-LazyJavaPackageFragment@177['java'] {
-    classes('lang': Name@211) = null // through LazyPackageFragmentScopeForJavaPackage@212
-    deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@212
-    functions('lang': Name@213) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@212
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@212
+LazyJavaPackageFragment@180['lang'] {
+    classes('Class': Name@214) = LazyJavaClassDescriptor@14['Class'] // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('Object': Name@216) = LazyJavaClassDescriptor@27['Object'] // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('System': Name@204) = LazyJavaClassDescriptor@57['System'] // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('getJavaClass': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('java': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    classes('typeinfo': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@215
+    deserializedPackageScope = Empty@208 // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('getJavaClass': Name@205) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    functions('typeinfo': Name@207) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@215
+    memberIndex = computeMemberIndex$1@217 // through LazyPackageFragmentScopeForJavaPackage@215
 }
 
-LazyJavaPackageFragment@181['lang'] {
-    classes('Class': Name@215) = LazyJavaClassDescriptor@15['Class'] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Object': Name@217) = LazyJavaClassDescriptor@28['Object'] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('System': Name@205) = LazyJavaClassDescriptor@58['System'] // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('getClass': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('getJavaClass': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('java': Name@207) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('println': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('typeinfo': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    deserializedPackageScope = Empty@209 // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('getClass': Name@32) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('getJavaClass': Name@206) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('println': Name@9) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    functions('typeinfo': Name@208) = EmptyList@6[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    memberIndex = computeMemberIndex$1@218 // through LazyPackageFragmentScopeForJavaPackage@216
+LazyJavaTypeParameterDescriptor@77['T'] {
+    defaultType = JetTypeImpl@218['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@219
+    upperBounds = LinkedHashSet@220[1] { NullableType@221 }
+    upperBoundsAsType = NullableType@221
 }
 
-LazyJavaTypeParameterDescriptor@78['T'] {
-    defaultType = JetTypeImpl@219['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@220
-    upperBounds = LinkedHashSet@221[1] { NullableType@222 }
-    upperBoundsAsType = NullableType@222
+LazyJavaTypeParameterResolver@222 {
+    resolve(JavaTypeParameterImpl@223['T']) = LazyJavaTypeParameterDescriptor@77['T']
 }
 
-LazyJavaTypeParameterResolver@223 {
-    resolve(JavaTypeParameterImpl@224['T']) = LazyJavaTypeParameterDescriptor@78['T']
+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]
+    <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]
+    <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]
+    <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]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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/kt743.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
index fa5e97ee222..5605e3eb8f5 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt743.lazy.log
@@ -50,3 +50,56 @@ LazyJavaPackageFragment@10['lang'] {
     functions('sure': Name@26) = 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@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]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <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]
+}
+
+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 72eeebdfda0..9f1ea0d26fd 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt750.lazy.log
@@ -1,59 +1,53 @@
 LazyJavaClassDescriptor@0['Appendable'] {
     functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
     memberIndex = computeMemberIndex$1@4 // through LazyJavaClassMemberScope@3
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
-LazyJavaClassDescriptor@7['AutoCloseable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@8
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+LazyJavaClassDescriptor@6['AutoCloseable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@7
+    memberIndex = computeMemberIndex$1@8 // through LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
-LazyJavaClassDescriptor@11['Closeable'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    memberIndex = computeMemberIndex$1@13 // through LazyJavaClassMemberScope@12
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+LazyJavaClassDescriptor@10['Closeable'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@11
+    memberIndex = computeMemberIndex$1@12 // through LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
-LazyJavaClassDescriptor@15['FilterOutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+LazyJavaClassDescriptor@14['FilterOutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@15
+    memberIndex = computeMemberIndex$1@16 // through LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
-LazyJavaClassDescriptor@19['Integer'] {
-    enumEntryIndex = LinkedHashMap@20 // through LazyJavaClassMemberScope@21
-    functions('valueOf': Name@22) = ArrayList@23[3] { JavaMethodDescriptor@24['valueOf'], JavaMethodDescriptor@25['valueOf'], JavaMethodDescriptor@26['valueOf'] } // through LazyJavaStaticClassScope@27
-    functions('valueOf': Name@22) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@28 // through LazyJavaClassMemberScope@21
-    memberIndex = computeMemberIndex$1@29 // through LazyJavaStaticClassScope@27
-    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@21
-    nestedClasses('valueOf': Name@22) = null // through LazyJavaClassMemberScope@21
-    properties('valueOf': Name@22) = EmptyList@2[empty] // through LazyJavaClassMemberScope@21
-    properties('valueOf': Name@22) = EmptyList@2[empty] // through LazyJavaStaticClassScope@27
-    typeConstructor = LazyJavaClassTypeConstructor@31['Integer']
+LazyJavaClassDescriptor@18['Integer'] {
+    enumEntryIndex = LinkedHashMap@19 // through LazyJavaClassMemberScope@20
+    functions('valueOf': Name@21) = ArrayList@22[3] { JavaMethodDescriptor@23['valueOf'], JavaMethodDescriptor@24['valueOf'], JavaMethodDescriptor@25['valueOf'] } // through LazyJavaStaticClassScope@26
+    functions('valueOf': Name@21) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@27 // through LazyJavaClassMemberScope@20
+    memberIndex = computeMemberIndex$1@28 // through LazyJavaStaticClassScope@26
+    nestedClassIndex = LinkedHashMap@29 // through LazyJavaClassMemberScope@20
+    nestedClasses('valueOf': Name@21) = null // through LazyJavaClassMemberScope@20
+    properties('valueOf': Name@21) = EmptyList@2[empty] // through LazyJavaClassMemberScope@20
+    properties('valueOf': Name@21) = EmptyList@2[empty] // through LazyJavaStaticClassScope@26
+    typeConstructor = LazyJavaClassTypeConstructor@30['Integer']
 }
 
-LazyJavaClassDescriptor@32['OutputStream'] {
-    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@33
-    memberIndex = computeMemberIndex$1@34 // through LazyJavaClassMemberScope@33
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@33
-    typeConstructor = LazyJavaClassTypeConstructor@35['OutputStream']
+LazyJavaClassDescriptor@31['OutputStream'] {
+    functions('println': Name@1) = EmptyList@2[empty] // through LazyJavaClassMemberScope@32
+    memberIndex = computeMemberIndex$1@33 // through LazyJavaClassMemberScope@32
+    typeConstructor = LazyJavaClassTypeConstructor@34['OutputStream']
 }
 
-LazyJavaClassDescriptor@36['PrintStream'] {
-    defaultType = JetTypeImpl@37['PrintStream']
-    enumEntryIndex = LinkedHashMap@38 // through LazyJavaClassMemberScope@39
-    functions('println': Name@5) = ArrayList@40[10] { JavaMethodDescriptor@41['println'], JavaMethodDescriptor@42['println'], JavaMethodDescriptor@43['println'], ... } // through LazyJavaClassMemberScope@39
-    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@39
-    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@39
-    nestedClasses('println': Name@5) = null // through LazyJavaClassMemberScope@39
-    properties('println': Name@5) = EmptyList@2[empty] // through LazyJavaClassMemberScope@39
+LazyJavaClassDescriptor@35['PrintStream'] {
+    defaultType = JetTypeImpl@36['PrintStream']
+    enumEntryIndex = LinkedHashMap@37 // through LazyJavaClassMemberScope@38
+    functions('println': Name@39) = ArrayList@40[10] { JavaMethodDescriptor@41['println'], JavaMethodDescriptor@42['println'], JavaMethodDescriptor@43['println'], ... } // through LazyJavaClassMemberScope@38
+    memberIndex = computeMemberIndex$1@44 // through LazyJavaClassMemberScope@38
+    nestedClassIndex = LinkedHashMap@45 // through LazyJavaClassMemberScope@38
+    nestedClasses('println': Name@39) = null // through LazyJavaClassMemberScope@38
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
     typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
 }
@@ -69,31 +63,31 @@ LazyJavaClassDescriptor@48['System'] {
     typeConstructor = LazyJavaClassTypeConstructor@58['System']
 }
 
-LazyJavaClassTypeConstructor@6['Appendable'] {
+LazyJavaClassTypeConstructor@5['Appendable'] {
     parameters = ArrayList@59[empty]
     supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
 }
 
-LazyJavaClassTypeConstructor@10['AutoCloseable'] {
+LazyJavaClassTypeConstructor@9['AutoCloseable'] {
     parameters = ArrayList@62[empty]
     supertypes = ArrayList@63[1] { JetTypeImpl@61['Any'] }
 }
 
-LazyJavaClassTypeConstructor@14['Closeable'] {
+LazyJavaClassTypeConstructor@13['Closeable'] {
     parameters = ArrayList@64[empty]
     supertypes = ArrayList@65[1] { LazyJavaClassifierType@66['AutoCloseable'] }
 }
 
-LazyJavaClassTypeConstructor@18['FilterOutputStream'] {
+LazyJavaClassTypeConstructor@17['FilterOutputStream'] {
     parameters = ArrayList@67[empty]
     supertypes = ArrayList@68[1] { LazyJavaClassifierType@69['OutputStream'] }
 }
 
-LazyJavaClassTypeConstructor@31['Integer'] {
+LazyJavaClassTypeConstructor@30['Integer'] {
     supertypes = ArrayList@70[2] { LazyJavaClassifierType@71['Number'], LazyJavaClassifierType@72['Comparable<Integer>'] }
 }
 
-LazyJavaClassTypeConstructor@35['OutputStream'] {
+LazyJavaClassTypeConstructor@34['OutputStream'] {
     parameters = ArrayList@73[empty]
     supertypes = ArrayList@74[1] { LazyJavaClassifierType@75['Closeable'] }
 }
@@ -111,28 +105,28 @@ LazyJavaClassifierType@79['Appendable'] {
     arguments = ArrayList@82[empty]
     classifier = JavaClassImpl@83['Appendable']
     memberScope = LazyJavaClassMemberScope@3
-    typeConstructor = LazyJavaClassTypeConstructor@6['Appendable']
+    typeConstructor = LazyJavaClassTypeConstructor@5['Appendable']
 }
 
 LazyJavaClassifierType@66['AutoCloseable'] {
     arguments = ArrayList@84[empty]
     classifier = JavaClassImpl@85['AutoCloseable']
-    memberScope = LazyJavaClassMemberScope@8
-    typeConstructor = LazyJavaClassTypeConstructor@10['AutoCloseable']
+    memberScope = LazyJavaClassMemberScope@7
+    typeConstructor = LazyJavaClassTypeConstructor@9['AutoCloseable']
 }
 
 LazyJavaClassifierType@80['Closeable'] {
     arguments = ArrayList@86[empty]
     classifier = JavaClassImpl@87['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@75['Closeable'] {
     arguments = ArrayList@88[empty]
     classifier = JavaClassImpl@89['Closeable']
-    memberScope = LazyJavaClassMemberScope@12
-    typeConstructor = LazyJavaClassTypeConstructor@14['Closeable']
+    memberScope = LazyJavaClassMemberScope@11
+    typeConstructor = LazyJavaClassTypeConstructor@13['Closeable']
 }
 
 LazyJavaClassifierType@72['Comparable<Integer>'] {
@@ -145,8 +139,8 @@ LazyJavaClassifierType@72['Comparable<Integer>'] {
 LazyJavaClassifierType@78['FilterOutputStream'] {
     arguments = ArrayList@95[empty]
     classifier = JavaClassImpl@96['FilterOutputStream']
-    memberScope = LazyJavaClassMemberScope@16
-    typeConstructor = LazyJavaClassTypeConstructor@18['FilterOutputStream']
+    memberScope = LazyJavaClassMemberScope@15
+    typeConstructor = LazyJavaClassTypeConstructor@17['FilterOutputStream']
 }
 
 LazyJavaClassifierType@97['Flushable'] {
@@ -184,7 +178,7 @@ LazyJavaClassifierType@110['Integer'] {
 
 LazyJavaClassifierType@113['Integer'] {
     arguments = ArrayList@114[empty]
-    classifier = JavaClassImpl@112['Integer']
+    classifier = JavaClassImpl@101['Integer']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@103
 }
@@ -198,14 +192,14 @@ LazyJavaClassifierType@116['Integer'] {
 
 LazyJavaClassifierType@118['Integer'] {
     arguments = ArrayList@119[empty]
-    classifier = JavaClassImpl@106['Integer']
+    classifier = JavaClassImpl@112['Integer']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@103
 }
 
 LazyJavaClassifierType@120['Integer'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@101['Integer']
+    classifier = JavaClassImpl@106['Integer']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@103
 }
@@ -254,14 +248,14 @@ LazyJavaClassifierType@138['Object'] {
 LazyJavaClassifierType@69['OutputStream'] {
     arguments = ArrayList@140[empty]
     classifier = JavaClassImpl@141['OutputStream']
-    memberScope = LazyJavaClassMemberScope@33
-    typeConstructor = LazyJavaClassTypeConstructor@35['OutputStream']
+    memberScope = LazyJavaClassMemberScope@32
+    typeConstructor = LazyJavaClassTypeConstructor@34['OutputStream']
 }
 
 LazyJavaClassifierType@142['PrintStream'] {
     arguments = ArrayList@143[empty]
     classifier = JavaClassImpl@144['PrintStream']
-    memberScope = LazyJavaClassMemberScope@39
+    memberScope = LazyJavaClassMemberScope@38
     nullable = 'false': Boolean@102
     typeConstructor = LazyJavaClassTypeConstructor@47['PrintStream']
 }
@@ -296,14 +290,14 @@ LazyJavaClassifierType@154['String'] {
 
 LazyJavaClassifierType@157['String'] {
     arguments = ArrayList@158[empty]
-    classifier = JavaClassImpl@153['String']
+    classifier = JavaClassImpl@149['String']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@150
 }
 
 LazyJavaClassifierType@159['String'] {
     arguments = ArrayList@160[empty]
-    classifier = JavaClassImpl@149['String']
+    classifier = JavaClassImpl@153['String']
     nullable = 'true': Boolean@115
     typeConstructor = DeserializedClassTypeConstructor@150
 }
@@ -345,12 +339,12 @@ LazyJavaPackageFragmentProvider@163 {
     packageFragments('kotlin.io': FqName@194) = null
     packageFragments('kotlin.jvm': FqName@195) = null
     topLevelClasses(JavaClassImpl@83['Appendable']) = LazyJavaClassDescriptor@0['Appendable']
-    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@7['AutoCloseable']
-    topLevelClasses(JavaClassImpl@87['Closeable']) = LazyJavaClassDescriptor@11['Closeable']
-    topLevelClasses(JavaClassImpl@96['FilterOutputStream']) = LazyJavaClassDescriptor@15['FilterOutputStream']
-    topLevelClasses(JavaClassImpl@196['Integer']) = LazyJavaClassDescriptor@19['Integer']
-    topLevelClasses(JavaClassImpl@141['OutputStream']) = LazyJavaClassDescriptor@32['OutputStream']
-    topLevelClasses(JavaClassImpl@144['PrintStream']) = LazyJavaClassDescriptor@36['PrintStream']
+    topLevelClasses(JavaClassImpl@85['AutoCloseable']) = LazyJavaClassDescriptor@6['AutoCloseable']
+    topLevelClasses(JavaClassImpl@87['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']
+    topLevelClasses(JavaClassImpl@144['PrintStream']) = LazyJavaClassDescriptor@35['PrintStream']
     topLevelClasses(JavaClassImpl@197['System']) = LazyJavaClassDescriptor@48['System']
 }
 
@@ -361,32 +355,136 @@ LazyJavaPackageFragment@165['<root>'] {
     classes('Integer': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@199
     classes('String': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@199
     classes('System': Name@204) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('plus': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    classes('sure': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@199
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('plus': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    functions('sure': Name@206) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
-    memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@199
+    classes('sure': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@199
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@199
+    functions('sure': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@199
+    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@199
 }
 
 LazyJavaPackageFragment@174['java'] {
-    classes('lang': Name@209) = null // through LazyPackageFragmentScopeForJavaPackage@210
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@210
-    functions('lang': Name@211) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@210
-    memberIndex = computeMemberIndex$1@212 // through LazyPackageFragmentScopeForJavaPackage@210
+    classes('lang': Name@208) = null // through LazyPackageFragmentScopeForJavaPackage@209
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@209
+    functions('lang': Name@210) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@209
+    memberIndex = computeMemberIndex$1@211 // through LazyPackageFragmentScopeForJavaPackage@209
 }
 
 LazyJavaPackageFragment@178['lang'] {
-    classes('Integer': Name@202) = LazyJavaClassDescriptor@19['Integer'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('System': Name@204) = LazyJavaClassDescriptor@48['System'] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('plus': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('println': Name@5) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('sure': Name@206) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('plus': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('println': Name@5) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('sure': Name@206) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    memberIndex = computeMemberIndex$1@214 // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('Integer': Name@202) = LazyJavaClassDescriptor@18['Integer'] // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('System': Name@204) = LazyJavaClassDescriptor@48['System'] // through LazyPackageFragmentScopeForJavaPackage@212
+    classes('sure': Name@205) = null // through LazyPackageFragmentScopeForJavaPackage@212
+    deserializedPackageScope = Empty@206 // through LazyPackageFragmentScopeForJavaPackage@212
+    functions('sure': Name@205) = EmptyList@2[empty] // through LazyPackageFragmentScopeForJavaPackage@212
+    memberIndex = computeMemberIndex$1@213 // through LazyPackageFragmentScopeForJavaPackage@212
+}
+
+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]
+    <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]
+    <name not found> = EmptyList@2[empty]
+    <name not found> = EmptyList@2[empty]
+    <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@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[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> = 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]
+    <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@266 {
+    <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@267 {
+    <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@268 {
+    <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/kt847.lazy.log b/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
index 12390635037..daf42297216 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt847.lazy.log
@@ -10,17 +10,14 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@12) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@16
-    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@16
-    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@16
+    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    deserializedPackageScope = Empty@13 // through LazyPackageFragmentScopeForJavaPackage@20
+ResolutionTaskHolder@19 {
+    <name not found> = ArrayList@20[1] { ResolutionCandidate@21 }
+    <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 827823532a2..298fb817195 100644
--- a/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/kt860.lazy.log
@@ -114,47 +114,47 @@ LazyJavaClassifierType@74['E'] {
     arguments = ArrayList@75[empty]
     classifier = JavaTypeParameterImpl@76['E']
     nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@77['E'] {
     arguments = ArrayList@78[empty]
     classifier = JavaTypeParameterImpl@79['E']
     nullable = 'false': Boolean@50
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@80['E'] {
     arguments = ArrayList@81[empty]
-    classifier = JavaTypeParameterImpl@64['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-}
-
-LazyJavaClassifierType@82['E'] {
-    arguments = ArrayList@83[empty]
-    classifier = JavaTypeParameterImpl@72['E']
-    nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-}
-
-LazyJavaClassifierType@84['E'] {
-    arguments = ArrayList@85[empty]
     classifier = JavaTypeParameterImpl@68['E']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-LazyJavaClassifierType@86['E'] {
-    arguments = ArrayList@87[empty]
+LazyJavaClassifierType@82['E'] {
+    arguments = ArrayList@83[empty]
     classifier = JavaTypeParameterImpl@79['E']
     nullable = 'true': Boolean@56
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    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']
+    nullable = 'true': Boolean@56
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 LazyJavaClassifierType@88['E'] {
     arguments = ArrayList@89[empty]
-    classifier = JavaTypeParameterImpl@76['E']
+    classifier = JavaTypeParameterImpl@64['E']
     nullable = 'true': Boolean@56
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
@@ -243,58 +243,123 @@ LazyJavaPackageFragment@111['java'] {
 
 LazyJavaPackageFragment@115['lang'] {
     classes('ArrayList': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('add': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('hasNext': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('next': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('to': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('hasNext': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('next': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@150
+    classes('to': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@150
     deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@150
     functions('ArrayList': Name@149) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('add': Name@151) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('hasNext': Name@152) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('next': Name@153) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('to': Name@154) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('hasNext': Name@151) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('next': Name@152) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    functions('to': Name@153) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@150
+    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@150
 }
 
 LazyJavaPackageFragment@121['util'] {
-    classes('ArrayList': Name@149) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('Iterator': Name@157) = LazyJavaClassDescriptor@140['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('MutableCollection': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('add': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('hasNext': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('next': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    classes('to': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@156
-    deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('ArrayList': Name@149) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('add': Name@151) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('hasNext': Name@152) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('next': Name@153) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    functions('to': Name@154) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@156
-    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@156
+    classes('ArrayList': Name@149) = LazyJavaClassDescriptor@6['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('Iterator': Name@156) = LazyJavaClassDescriptor@140['Iterator'] // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('MutableCollection': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('hasNext': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('next': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('to': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@155
+    deserializedPackageScope = Empty@144 // through LazyPackageFragmentScopeForJavaPackage@155
+    functions('ArrayList': Name@149) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
+    functions('hasNext': Name@151) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
+    functions('next': Name@152) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
+    functions('to': Name@153) = EmptyList@146[empty] // through LazyPackageFragmentScopeForJavaPackage@155
+    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@155
 }
 
 LazyJavaTypeParameterDescriptor@28['E'] {
-    defaultType = JetTypeImpl@160['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
-    upperBounds = LinkedHashSet@161[1] { NullableType@162 }
+    defaultType = JetTypeImpl@159['E']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    upperBounds = LinkedHashSet@160[1] { NullableType@161 }
 }
 
 LazyJavaTypeParameterDescriptor@23['E'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 LazyJavaTypeParameterDescriptor@19['E'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
 }
 
-LazyJavaTypeParameterResolver@163 {
-    resolve(JavaTypeParameterImpl@164['E']) = LazyJavaTypeParameterDescriptor@28['E']
+LazyJavaTypeParameterResolver@162 {
+    resolve(JavaTypeParameterImpl@163['E']) = LazyJavaTypeParameterDescriptor@19['E']
+}
+
+LazyJavaTypeParameterResolver@164 {
+    resolve(JavaTypeParameterImpl@64['E']) = LazyJavaTypeParameterDescriptor@23['E']
 }
 
 LazyJavaTypeParameterResolver@165 {
-    resolve(JavaTypeParameterImpl@166['E']) = LazyJavaTypeParameterDescriptor@19['E']
+    resolve(JavaTypeParameterImpl@166['E']) = LazyJavaTypeParameterDescriptor@28['E']
 }
 
-LazyJavaTypeParameterResolver@167 {
-    resolve(JavaTypeParameterImpl@68['E']) = LazyJavaTypeParameterDescriptor@23['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]
+    <name not found> = EmptyList@146[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@146[empty]
+    <name not found> = EmptyList@146[empty]
+}
+
+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[3] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195 }
+    <name not found> = ArrayList@196[3] { ResolutionCandidate@193, ResolutionCandidate@194, ResolutionCandidate@195 }
+    <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]
+    <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]
 }
diff --git a/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log b/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
index 440b382ada0..999350d72e2 100644
--- a/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
+++ b/compiler/testData/diagnostics/tests/regressions/resolveSubclassOfList.lazy.log
@@ -2,76 +2,70 @@ LazyJavaClassDescriptor@0['AbstractCollection'] {
     defaultType = JetTypeImpl@1['AbstractCollection<1>']
     functions('iterator': Name@2) = ArrayList@3[1] { JavaMethodDescriptor@4['iterator'] } // through LazyJavaClassMemberScope@5
     memberIndex = computeMemberIndex$1@6 // through LazyJavaClassMemberScope@5
-    properties('iterator': 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['AbstractList'] {
-    defaultType = JetTypeImpl@12['AbstractList<1>']
-    functions('iterator': Name@13) = ArrayList@14[1] { JavaMethodDescriptor@15['iterator'] } // through LazyJavaClassMemberScope@16
-    memberIndex = computeMemberIndex$1@17 // through LazyJavaClassMemberScope@16
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@16
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@18['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+LazyJavaClassDescriptor@9['AbstractList'] {
+    defaultType = JetTypeImpl@10['AbstractList<1>']
+    functions('iterator': Name@11) = ArrayList@12[1] { JavaMethodDescriptor@13['iterator'] } // through LazyJavaClassMemberScope@14
+    memberIndex = computeMemberIndex$1@15 // through LazyJavaClassMemberScope@14
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@16['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
-LazyJavaClassDescriptor@20['ArrayList'] {
-    constructors = ArrayList@21[3] { JavaConstructorDescriptor@22['<init>'], JavaConstructorDescriptor@23['<init>'], JavaConstructorDescriptor@24['<init>'] } // through LazyJavaClassMemberScope@25
-    defaultType = JetTypeImpl@26['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@27 // through LazyJavaClassMemberScope@25
+LazyJavaClassDescriptor@18['ArrayList'] {
+    constructors = ArrayList@19[3] { JavaConstructorDescriptor@20['<init>'], JavaConstructorDescriptor@21['<init>'], JavaConstructorDescriptor@22['<init>'] } // through LazyJavaClassMemberScope@23
+    defaultType = JetTypeImpl@24['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@25 // through LazyJavaClassMemberScope@23
     functionTypeForSamInterface = null
-    functions('iterator': Name@7) = ArrayList@28[1] { JavaMethodDescriptor@29['iterator'] } // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@30 // through LazyJavaClassMemberScope@25
-    nestedClassIndex = LinkedHashMap@31 // through LazyJavaClassMemberScope@25
-    nestedClasses('iterator': Name@7) = null // through LazyJavaClassMemberScope@25
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@33['ArrayList']
+    functions('iterator': Name@26) = ArrayList@27[1] { JavaMethodDescriptor@28['iterator'] } // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@29 // through LazyJavaClassMemberScope@23
+    nestedClassIndex = LinkedHashMap@30 // through LazyJavaClassMemberScope@23
+    nestedClasses('iterator': Name@26) = null // through LazyJavaClassMemberScope@23
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@32['ArrayList']
 }
 
-LazyJavaClassDescriptor@34['List'] {
-    defaultType = JetTypeImpl@35['List<1>']
-    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@37
-    functions('iterator': Name@38) = ArrayList@39[1] { JavaMethodDescriptor@40['iterator'] } // through LazyJavaClassMemberScope@37
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@37
-    nestedClassIndex = LinkedHashMap@42 // through LazyJavaClassMemberScope@37
-    nestedClasses('iterator': Name@38) = null // through LazyJavaClassMemberScope@37
-    properties('iterator': Name@38) = EmptyList@8[empty] // through LazyJavaClassMemberScope@37
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@43['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@44['List']
+LazyJavaClassDescriptor@33['List'] {
+    defaultType = JetTypeImpl@34['List<1>']
+    enumEntryIndex = LinkedHashMap@35 // through LazyJavaClassMemberScope@36
+    functions('iterator': Name@37) = ArrayList@38[1] { JavaMethodDescriptor@39['iterator'] } // through LazyJavaClassMemberScope@36
+    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@36
+    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@36
+    nestedClasses('iterator': Name@37) = null // through LazyJavaClassMemberScope@36
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@42['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@43['List']
 }
 
-LazyJavaClassDescriptor@45['RandomAccess'] {
-    functions('iterator': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@46
+LazyJavaClassDescriptor@44['RandomAccess'] {
+    functions('iterator': Name@11) = EmptyList@45[empty] // through LazyJavaClassMemberScope@46
     memberIndex = computeMemberIndex$1@47 // through LazyJavaClassMemberScope@46
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@46
     typeConstructor = LazyJavaClassTypeConstructor@48['RandomAccess']
 }
 
 LazyJavaClassDescriptor@49['Serializable'] {
-    functions('iterator': Name@13) = EmptyList@8[empty] // through LazyJavaClassMemberScope@50
+    functions('iterator': Name@11) = EmptyList@45[empty] // through LazyJavaClassMemberScope@50
     memberIndex = computeMemberIndex$1@51 // through LazyJavaClassMemberScope@50
-    properties('iterator': Name@7) = EmptyList@8[empty] // through LazyJavaClassMemberScope@50
     typeConstructor = LazyJavaClassTypeConstructor@52['Serializable']
 }
 
-LazyJavaClassTypeConstructor@10['AbstractCollection'] {
+LazyJavaClassTypeConstructor@8['AbstractCollection'] {
     parameters = ArrayList@53[1] { LazyJavaTypeParameterDescriptor@54['E'] }
     supertypes = ArrayList@55[1] { LazyJavaClassifierType@56['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@19['AbstractList'] {
+LazyJavaClassTypeConstructor@17['AbstractList'] {
     parameters = ArrayList@57[1] { LazyJavaTypeParameterDescriptor@58['E'] }
     supertypes = ArrayList@59[2] { LazyJavaClassifierType@60['AbstractCollection<E>'], LazyJavaClassifierType@61['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@33['ArrayList'] {
+LazyJavaClassTypeConstructor@32['ArrayList'] {
     parameters = ArrayList@62[1] { LazyJavaTypeParameterDescriptor@63['E'] }
     supertypes = ArrayList@64[5] { LazyJavaClassifierType@65['AbstractList<E>'], LazyJavaClassifierType@66['List<E>'], LazyJavaClassifierType@67['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@44['List'] {
+LazyJavaClassTypeConstructor@43['List'] {
     parameters = ArrayList@68[1] { LazyJavaTypeParameterDescriptor@69['E'] }
     supertypes = ArrayList@70[1] { LazyJavaClassifierType@71['Collection<E>'] }
 }
@@ -90,14 +84,14 @@ LazyJavaClassifierType@60['AbstractCollection<E>'] {
     arguments = ArrayList@77[1] { TypeProjectionImpl@78 }
     classifier = JavaClassImpl@79['AbstractCollection']
     memberScope = SubstitutingScope@80
-    typeConstructor = LazyJavaClassTypeConstructor@10['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@8['AbstractCollection']
 }
 
 LazyJavaClassifierType@65['AbstractList<E>'] {
     arguments = ArrayList@81[1] { TypeProjectionImpl@82 }
     classifier = JavaClassImpl@83['AbstractList']
     memberScope = SubstitutingScope@84
-    typeConstructor = LazyJavaClassTypeConstructor@19['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@17['AbstractList']
 }
 
 LazyJavaClassifierType@85['Cloneable'] {
@@ -123,14 +117,14 @@ LazyJavaClassifierType@97['Collection<? extends E>'] {
     typeConstructor = DeserializedClassTypeConstructor@102
 }
 
-LazyJavaClassifierType@56['Collection<E>'] {
+LazyJavaClassifierType@71['Collection<E>'] {
     arguments = ArrayList@103[1] { TypeProjectionImpl@104 }
     classifier = JavaClassImpl@105['Collection']
     memberScope = SubstitutingScope@106
     typeConstructor = DeserializedClassTypeConstructor@96
 }
 
-LazyJavaClassifierType@71['Collection<E>'] {
+LazyJavaClassifierType@56['Collection<E>'] {
     arguments = ArrayList@107[1] { TypeProjectionImpl@108 }
     classifier = JavaClassImpl@109['Collection']
     memberScope = SubstitutingScope@110
@@ -155,98 +149,98 @@ LazyJavaClassifierType@119['E'] {
     arguments = ArrayList@120[empty]
     classifier = JavaTypeParameterImpl@121['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
-LazyJavaClassifierType@122['E'] {
-    arguments = ArrayList@123[empty]
-    classifier = JavaTypeParameterImpl@124['E']
+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']
     nullable = 'false': Boolean@95
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
-LazyJavaClassifierType@125['E'] {
-    arguments = ArrayList@126[empty]
-    classifier = JavaTypeParameterImpl@127['E']
+LazyJavaClassifierType@139['E'] {
+    arguments = ArrayList@140[empty]
+    classifier = JavaTypeParameterImpl@141['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
-LazyJavaClassifierType@128['E'] {
-    arguments = ArrayList@129[empty]
-    classifier = JavaTypeParameterImpl@130['E']
+LazyJavaClassifierType@142['E'] {
+    arguments = ArrayList@143[empty]
+    classifier = JavaTypeParameterImpl@144['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
-LazyJavaClassifierType@131['E'] {
-    arguments = ArrayList@132[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+LazyJavaClassifierType@145['E'] {
+    arguments = ArrayList@146[empty]
+    classifier = JavaTypeParameterImpl@147['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
-}
-
-LazyJavaClassifierType@135['E'] {
-    arguments = ArrayList@136[empty]
-    classifier = JavaTypeParameterImpl@137['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
-}
-
-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@118
-}
-
-LazyJavaClassifierType@144['E'] {
-    arguments = ArrayList@145[empty]
-    classifier = JavaTypeParameterImpl@146['E']
-    nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@148['E'] {
     arguments = ArrayList@149[empty]
     classifier = JavaTypeParameterImpl@150['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@151['E'] {
     arguments = ArrayList@152[empty]
     classifier = JavaTypeParameterImpl@153['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@154['E'] {
     arguments = ArrayList@155[empty]
     classifier = JavaTypeParameterImpl@156['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@157['E'] {
     arguments = ArrayList@158[empty]
     classifier = JavaTypeParameterImpl@159['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@160['E'] {
     arguments = ArrayList@161[empty]
     classifier = JavaTypeParameterImpl@162['E']
     nullable = 'false': Boolean@95
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@163['E'] {
@@ -258,23 +252,23 @@ LazyJavaClassifierType@163['E'] {
 
 LazyJavaClassifierType@165['E'] {
     arguments = ArrayList@166[empty]
-    classifier = JavaTypeParameterImpl@159['E']
+    classifier = JavaTypeParameterImpl@162['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@167['E'] {
     arguments = ArrayList@168[empty]
-    classifier = JavaTypeParameterImpl@124['E']
+    classifier = JavaTypeParameterImpl@153['E']
     nullable = 'true': Boolean@101
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@169['E'] {
     arguments = ArrayList@170[empty]
-    classifier = JavaTypeParameterImpl@153['E']
+    classifier = JavaTypeParameterImpl@129['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@171['E'] {
@@ -286,79 +280,79 @@ LazyJavaClassifierType@171['E'] {
 
 LazyJavaClassifierType@173['E'] {
     arguments = ArrayList@174[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@150['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@175['E'] {
     arguments = ArrayList@176[empty]
-    classifier = JavaTypeParameterImpl@156['E']
+    classifier = JavaTypeParameterImpl@159['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@177['E'] {
     arguments = ArrayList@178[empty]
-    classifier = JavaTypeParameterImpl@121['E']
+    classifier = JavaTypeParameterImpl@144['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@179['E'] {
     arguments = ArrayList@180[empty]
-    classifier = JavaTypeParameterImpl@162['E']
+    classifier = JavaTypeParameterImpl@132['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@181['E'] {
     arguments = ArrayList@182[empty]
-    classifier = JavaTypeParameterImpl@150['E']
+    classifier = JavaTypeParameterImpl@156['E']
     nullable = 'true': Boolean@101
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 LazyJavaClassifierType@183['E'] {
     arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@137['E']
+    classifier = JavaTypeParameterImpl@138['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 LazyJavaClassifierType@185['E'] {
     arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@130['E']
+    classifier = JavaTypeParameterImpl@141['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@187['E'] {
     arguments = ArrayList@188[empty]
-    classifier = JavaTypeParameterImpl@140['E']
+    classifier = JavaTypeParameterImpl@125['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@189['E'] {
     arguments = ArrayList@190[empty]
-    classifier = JavaTypeParameterImpl@127['E']
+    classifier = JavaTypeParameterImpl@135['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@191['E'] {
     arguments = ArrayList@192[empty]
-    classifier = JavaTypeParameterImpl@143['E']
+    classifier = JavaTypeParameterImpl@147['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 LazyJavaClassifierType@193['E'] {
     arguments = ArrayList@194[empty]
-    classifier = JavaTypeParameterImpl@146['E']
+    classifier = JavaTypeParameterImpl@121['E']
     nullable = 'true': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 LazyJavaClassifierType@195['Iterator<E>'] {
@@ -395,7 +389,7 @@ LazyJavaClassifierType@211['Iterator<E>'] {
 
 LazyJavaClassifierType@216['Iterator<E>'] {
     arguments = ArrayList@217[1] { TypeProjectionImpl@218 }
-    classifier = JavaClassImpl@198['Iterator']
+    classifier = JavaClassImpl@204['Iterator']
     memberScope = SubstitutingScope@219
     nullable = 'true': Boolean@101
     typeConstructor = DeserializedClassTypeConstructor@220
@@ -403,7 +397,7 @@ LazyJavaClassifierType@216['Iterator<E>'] {
 
 LazyJavaClassifierType@221['Iterator<E>'] {
     arguments = ArrayList@222[1] { TypeProjectionImpl@223 }
-    classifier = JavaClassImpl@204['Iterator']
+    classifier = JavaClassImpl@214['Iterator']
     memberScope = SubstitutingScope@224
     nullable = 'true': Boolean@101
     typeConstructor = DeserializedClassTypeConstructor@220
@@ -411,7 +405,7 @@ LazyJavaClassifierType@221['Iterator<E>'] {
 
 LazyJavaClassifierType@225['Iterator<E>'] {
     arguments = ArrayList@226[1] { TypeProjectionImpl@227 }
-    classifier = JavaClassImpl@214['Iterator']
+    classifier = JavaClassImpl@198['Iterator']
     memberScope = SubstitutingScope@228
     nullable = 'true': Boolean@101
     typeConstructor = DeserializedClassTypeConstructor@220
@@ -483,22 +477,20 @@ LazyJavaPackageFragmentProvider@254 {
     packageFragments('kotlin.io': FqName@271) = null
     packageFragments('kotlin.jvm': FqName@272) = null
     topLevelClasses(JavaClassImpl@79['AbstractCollection']) = LazyJavaClassDescriptor@0['AbstractCollection']
-    topLevelClasses(JavaClassImpl@83['AbstractList']) = LazyJavaClassDescriptor@11['AbstractList']
-    topLevelClasses(JavaClassImpl@273['ArrayList']) = LazyJavaClassDescriptor@20['ArrayList']
-    topLevelClasses(JavaClassImpl@274['List']) = LazyJavaClassDescriptor@34['List']
-    topLevelClasses(JavaClassImpl@250['RandomAccess']) = LazyJavaClassDescriptor@45['RandomAccess']
+    topLevelClasses(JavaClassImpl@83['AbstractList']) = LazyJavaClassDescriptor@9['AbstractList']
+    topLevelClasses(JavaClassImpl@273['ArrayList']) = LazyJavaClassDescriptor@18['ArrayList']
+    topLevelClasses(JavaClassImpl@274['List']) = LazyJavaClassDescriptor@33['List']
+    topLevelClasses(JavaClassImpl@250['RandomAccess']) = LazyJavaClassDescriptor@44['RandomAccess']
     topLevelClasses(JavaClassImpl@253['Serializable']) = LazyJavaClassDescriptor@49['Serializable']
 }
 
 LazyJavaPackageFragment@256['<root>'] {
     classes('ArrayList': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@276
     classes('String': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@276
-    classes('iterator': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@276
     classes('java': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@276
     deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@276
-    functions('ArrayList': Name@280) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@276
-    functions('iterator': Name@38) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@276
-    functions('java': Name@281) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@276
+    functions('ArrayList': Name@280) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@276
+    functions('java': Name@281) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@276
     memberIndex = computeMemberIndex$1@282 // through LazyPackageFragmentScopeForJavaPackage@276
 }
 
@@ -506,84 +498,106 @@ LazyJavaPackageFragment@259['java'] {
     classes('lang': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@284
     classes('util': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@284
     deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('lang': Name@286) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('util': Name@287) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('lang': Name@286) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@284
+    functions('util': Name@287) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@284
     memberIndex = computeMemberIndex$1@288 // through LazyPackageFragmentScopeForJavaPackage@284
 }
 
 LazyJavaPackageFragment@263['lang'] {
     classes('ArrayList': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@289
-    classes('iterator': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@289
     classes('java': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@289
     deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@289
-    functions('ArrayList': Name@280) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@289
-    functions('iterator': Name@38) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@289
+    functions('ArrayList': Name@280) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@289
     memberIndex = computeMemberIndex$1@291 // through LazyPackageFragmentScopeForJavaPackage@289
 }
 
 LazyJavaPackageFragment@266['util'] {
-    classes('ArrayList': Name@292) = LazyJavaClassDescriptor@20['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@293
-    classes('List': Name@294) = LazyJavaClassDescriptor@34['List'] // through LazyPackageFragmentScopeForJavaPackage@293
+    classes('ArrayList': Name@292) = LazyJavaClassDescriptor@18['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@293
+    classes('List': Name@294) = LazyJavaClassDescriptor@33['List'] // through LazyPackageFragmentScopeForJavaPackage@293
     deserializedPackageScope = Empty@279 // through LazyPackageFragmentScopeForJavaPackage@293
-    functions('ArrayList': Name@295) = EmptyList@8[empty] // through LazyPackageFragmentScopeForJavaPackage@293
+    functions('ArrayList': Name@295) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@293
     memberIndex = computeMemberIndex$1@296 // through LazyPackageFragmentScopeForJavaPackage@293
 }
 
-LazyJavaTypeParameterDescriptor@69['E'] {
+LazyJavaTypeParameterDescriptor@54['E'] {
     defaultType = JetTypeImpl@297['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
     upperBounds = LinkedHashSet@298[1] { NullableType@299 }
     upperBoundsAsType = NullableType@299
 }
 
-LazyJavaTypeParameterDescriptor@54['E'] {
+LazyJavaTypeParameterDescriptor@58['E'] {
     defaultType = JetTypeImpl@300['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@147
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
     upperBounds = LinkedHashSet@301[1] { NullableType@302 }
     upperBoundsAsType = NullableType@302
 }
 
-LazyJavaTypeParameterDescriptor@58['E'] {
+LazyJavaTypeParameterDescriptor@69['E'] {
     defaultType = JetTypeImpl@303['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
     upperBounds = LinkedHashSet@304[1] { NullableType@305 }
     upperBoundsAsType = NullableType@305
 }
 
 LazyJavaTypeParameterDescriptor@63['E'] {
     defaultType = JetTypeImpl@306['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
     upperBounds = LinkedHashSet@307[1] { NullableType@308 }
 }
 
 LazyJavaTypeParameterResolver@309 {
-    resolve(JavaTypeParameterImpl@310['E']) = LazyJavaTypeParameterDescriptor@69['E']
+    resolve(JavaTypeParameterImpl@310['E']) = LazyJavaTypeParameterDescriptor@63['E']
 }
 
 LazyJavaTypeParameterResolver@311 {
-    resolve(JavaTypeParameterImpl@312['E']) = LazyJavaTypeParameterDescriptor@54['E']
+    resolve(JavaTypeParameterImpl@312['E']) = LazyJavaTypeParameterDescriptor@69['E']
 }
 
 LazyJavaTypeParameterResolver@313 {
-    resolve(JavaTypeParameterImpl@314['E']) = LazyJavaTypeParameterDescriptor@63['E']
+    resolve(JavaTypeParameterImpl@314['E']) = LazyJavaTypeParameterDescriptor@58['E']
 }
 
 LazyJavaTypeParameterResolver@315 {
-    resolve(JavaTypeParameterImpl@316['E']) = LazyJavaTypeParameterDescriptor@58['E']
+    resolve(JavaTypeParameterImpl@316['E']) = LazyJavaTypeParameterDescriptor@54['E']
 }
 
 LazyJavaTypeParameterResolver@317 {
-    resolve(JavaTypeParameterImpl@143['E']) = null
+    resolve(JavaTypeParameterImpl@153['E']) = null
 }
 
 LazyJavaTypeParameterResolver@318 {
-    resolve(JavaTypeParameterImpl@127['E']) = null
+    resolve(JavaTypeParameterImpl@113['E']) = null
 }
 
 LazyJavaTypeParameterResolver@319 {
-    resolve(JavaTypeParameterImpl@156['E']) = null
+    resolve(JavaTypeParameterImpl@135['E']) = null
 }
 
 LazyJavaTypeParameterResolver@320 {
-    resolve(JavaTypeParameterImpl@159['E']) = null
+    resolve(JavaTypeParameterImpl@129['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@329 {
+    <name not found> = ArrayList@330[1] { ResolutionCandidate@331 }
+    <name not found> = ArrayList@332[1] { ResolutionCandidate@331 }
+}
+
+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]
+    <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 d7c2587da2e..162b8e5e9f5 100644
--- a/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/ambiguityOnPropertiesWithTheSamePackageName.lazy.log
@@ -36,3 +36,14 @@ LazyJavaPackageFragment@20['lang'] {
     classes('d': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
     deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@35
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log b/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
index 63061d58a0d..a2345e192cd 100644
--- a/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/incompleteConstructorInvocation.lazy.log
@@ -39,3 +39,66 @@ LazyJavaPackageFragment@11['lang'] {
     functions('X': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 af824720795..a475e749d71 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/KT-4372.lazy.log
@@ -148,14 +148,14 @@ LazyJavaClassifierType@81['String'] {
 
 LazyJavaClassifierType@84['String'] {
     arguments = ArrayList@85[empty]
-    classifier = JavaClassImpl@77['String']
+    classifier = JavaClassImpl@80['String']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@74
 }
 
 LazyJavaClassifierType@86['String'] {
     arguments = ArrayList@87[empty]
-    classifier = JavaClassImpl@80['String']
+    classifier = JavaClassImpl@77['String']
     nullable = 'true': Boolean@83
     typeConstructor = DeserializedClassTypeConstructor@74
 }
@@ -299,3 +299,206 @@ LazyJavaTypeParameterDescriptor@38['T'] {
 LazyJavaTypeParameterResolver@167 {
     resolve(JavaTypeParameterImpl@168['T']) = LazyJavaTypeParameterDescriptor@38['T']
 }
+
+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> = 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]
+}
+
+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]
+    <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@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]
+    <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@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]
+    <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@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]
+    <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@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, ... }
+    <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 68eab8cd815..6feba7c5be7 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/ambiguityForInvoke.lazy.log
@@ -39,3 +39,24 @@ LazyJavaPackageFragment@8['lang'] {
     functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <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 }
+    <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 78d919d8f9a..8911b3f5603 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/invisibleInvoke.lazy.log
@@ -42,3 +42,158 @@ LazyJavaPackageFragment@9['lang'] {
     functions('invoke': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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> = 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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 {
+    <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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 }
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 d0a55b2cfbc..1fa0030a1f6 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/receiverPresenceErrorForInvoke.lazy.log
@@ -43,3 +43,134 @@ LazyJavaPackageFragment@9['lang'] {
     functions('invoke': Name@24) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <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@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]
+    <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> = ArrayList@45[1] { ResolutionCandidate@44 }
+    <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@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]
+    <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]
+    <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@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[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 {
+    <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 f8660daf028..73291e11706 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/typeInferenceErrorForInvoke.lazy.log
@@ -45,3 +45,74 @@ LazyJavaPackageFragment@10['lang'] {
     functions('s': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <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@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]
+    <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 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <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@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]
+}
+
+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 051a41aa8e8..b95ae248ef2 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unresolvedInvoke.lazy.log
@@ -35,3 +35,57 @@ LazyJavaPackageFragment@7['lang'] {
     functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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]
+}
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@32 }
+}
+
+ResolutionTaskHolder@34 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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@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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 721b7c07f0f..e3a1ad95f4a 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/unsafeCallWithInvoke.lazy.log
@@ -39,3 +39,62 @@ LazyJavaPackageFragment@8['lang'] {
     functions('s': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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]
+    <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> = 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]
+}
+
+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 }
+}
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 24f51114782..61a1518d461 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverForInvokeOnExpression.lazy.log
@@ -39,3 +39,68 @@ LazyJavaPackageFragment@9['lang'] {
     functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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 }
+    <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 }
+    <name not found> = EmptyList@25[empty]
+    <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]
+}
+
+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@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 }
+}
+
+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 }
+}
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 005e2367434..8bda2c8b35f 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/errors/wrongReceiverTypeForInvoke.lazy.log
@@ -39,3 +39,52 @@ LazyJavaPackageFragment@8['lang'] {
     functions('invoke': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <name not found> = EmptyList@22[empty]
+    <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]
+    <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> = 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]
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
index 444b0bb450c..64cead587ad 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsExtension.lazy.log
@@ -65,3 +65,429 @@ LazyJavaPackageFragment@14['lang'] {
     functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@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]
+    <name not found> = EmptyList@39[empty]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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> = 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]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@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 }
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@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]
+    <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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <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]
+    <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@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@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@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@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@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]
+    <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]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <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 444b0bb450c..f30f310815b 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMember.lazy.log
@@ -65,3 +65,379 @@ LazyJavaPackageFragment@14['lang'] {
     functions('with': Name@37) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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]
+    <name not found> = EmptyList@39[empty]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@55 {
+    <name not found> = ArrayList@56[1] { ResolutionCandidate@57 }
+    <name not found> = ArrayList@58[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]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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> = 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]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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@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@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@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 }
+}
+
+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 }
+}
+
+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> = 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]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <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 9098498c99b..1a8a5580689 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtension.lazy.log
@@ -81,3 +81,940 @@ LazyJavaPackageFragment@20['lang'] {
     functions('with': Name@53) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
 }
+
+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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@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]
+    <name not found> = EmptyList@55[empty]
+    <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 }
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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]
+}
+
+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]
+    <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 {
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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> = ArrayList@108[1] { ResolutionCandidate@109 }
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@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@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]
+    <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@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]
+    <name not found> = EmptyList@55[empty]
+    <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[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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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> = 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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+}
+
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@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@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]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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]
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <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@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@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@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@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@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@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@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@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@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[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 {
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <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]
+    <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]
+    <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 {
+    <name not found> = EmptyList@55[empty]
+    <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 82f67269247..54bd43977a8 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/invokeAsMemberExtensionToExplicitReceiver.lazy.log
@@ -45,3 +45,71 @@ LazyJavaPackageFragment@10['lang'] {
     functions('invoke': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+}
+
+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]
+    <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 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+    <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@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@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/kt3772.lazy.log b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
index a6056f9d386..757981519e7 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3772.lazy.log
@@ -50,13 +50,133 @@ LazyJavaPackageFragment@22['lang'] {
     classes('D': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@47
     classes('attr': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@47
     classes('d': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('invoke': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@47
     deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@47
     functions('A': Name@46) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     functions('B': Name@48) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     functions('D': Name@49) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     functions('attr': Name@50) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
     functions('d': Name@51) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    functions('invoke': Name@52) = EmptyList@44[empty] // through LazyPackageFragmentScopeForJavaPackage@47
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@52 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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]
+    <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@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]
+    <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> = ArrayList@64[1] { ResolutionCandidate@63 }
+    <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@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@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 }
+}
+
+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 }
+    <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@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]
+    <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 {
+    <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 7c656fbcb39..636871b811c 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt3833-invokeInsideNestedClass.lazy.log
@@ -31,15 +31,119 @@ LazyJavaPackageFragment@7['java'] {
 
 LazyJavaPackageFragment@9['lang'] {
     classes('X': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('invoke': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('left': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('right': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@32
-    classes('v': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('left': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    classes('right': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@32
     deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@32
     functions('X': Name@31) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('invoke': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('left': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('right': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    functions('v': Name@36) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('left': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('right': Name@34) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@32
+}
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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> = 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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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 }
+    <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 9d4efbfbe7e..c3f41cb1d80 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4204-completeNestedCallsForInvoke.lazy.log
@@ -42,3 +42,80 @@ LazyJavaPackageFragment@16['lang'] {
     functions('position': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@35
 }
+
+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@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]
+    <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@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 }
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 b057d7cb6ec..9010234c66e 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/kt4321InvokeOnEnum.lazy.log
@@ -28,29 +28,131 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('cls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('cls2': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('DOMElementTestClasses': Name@27) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('cls': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('cls2': Name@34) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('invoke': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('DOMElementTestClasses': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('cls': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('cls2': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['java'] {
-    classes('lang': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@37
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
-    functions('lang': Name@38) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@37
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('lang': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@36
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@36
+    functions('lang': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@36
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@36
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('cls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('cls2': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('invoke': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('cls': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('cls2': Name@34) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    functions('invoke': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('cls': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('cls2': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('cls': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('cls2': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+}
+
+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]
+    <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]
+    <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@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@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 }
+}
+
+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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@79 {
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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 7d4a7c5f9cb..2a94f7dfa2b 100644
--- a/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/invoke/valNamedInvoke.lazy.log
@@ -38,3 +38,71 @@ LazyJavaPackageFragment@9['lang'] {
     functions('invoke': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+}
+
+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]
+}
+
+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]
+    <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 {
+    <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@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/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
index 3b428cce8c2..e7166b0a3d6 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeArgsInFreeExpressionPosition.lazy.log
@@ -17,26 +17,57 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('Any': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('toString': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('use': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('toString': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('use': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('use': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('use': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
-    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('toString': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('use': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('toString': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('use': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('use': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('use': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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]
+    <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@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 }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
index aac4d5347dd..e2f09a8d49a 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/analyzeUnmappedArguments.lazy.log
@@ -43,3 +43,114 @@ LazyJavaPackageFragment@15['lang'] {
     functions('with': Name@35) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <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> = ArrayList@48[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]
+}
+
+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@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/resolve/nestedCalls/argumentsInParentheses.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
index cc78a3f0908..000435af5d2 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/argumentsInParentheses.lazy.log
@@ -45,14 +45,14 @@ LazyJavaClassifierType@25['String'] {
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@16['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@16['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
 }
@@ -136,34 +136,232 @@ LazyJavaPackageFragment@52['<root>'] {
     classes('Int': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@77
     classes('fooInt': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('invoke': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Bar': Name@76) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Exception': Name@78) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('bar': Name@80) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('fooInt': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('invoke': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('Bar': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('Exception': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('bar': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('fooInt': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@59['java'] {
-    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('lang': Name@88) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('lang': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('lang': Name@87) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
 LazyJavaPackageFragment@61['lang'] {
-    classes('Bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('Exception': Name@78) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('fooInt': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    classes('invoke': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@90
-    deserializedPackageScope = Empty@83 // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Bar': Name@76) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('Exception': Name@78) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('bar': Name@80) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('fooInt': Name@81) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    functions('invoke': Name@82) = EmptyList@84[empty] // through LazyPackageFragmentScopeForJavaPackage@90
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('Bar': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('Exception': Name@78) = LazyJavaClassDescriptor@3['Exception'] // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('bar': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('fooInt': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('Bar': Name@76) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('Exception': Name@78) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('bar': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('fooInt': Name@81) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    memberIndex = computeMemberIndex$1@90 // through LazyPackageFragmentScopeForJavaPackage@89
+}
+
+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]
+    <name not found> = EmptyList@83[empty]
+    <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@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]
+}
+
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { 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]
+}
+
+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]
+    <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@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]
+    <name not found> = EmptyList@83[empty]
+}
+
+ResolutionTaskHolder@123 {
+    <name not found> = ArrayList@124[1] { ResolutionCandidate@125 }
+    <name not found> = ArrayList@126[1] { ResolutionCandidate@125 }
+    <name not found> = EmptyList@83[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@83[empty]
+}
+
+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@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@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> = 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, ... }
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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 ed155174a93..2fcff4500f9 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/completeTypeInferenceForNestedInNoneApplicable.lazy.log
@@ -38,14 +38,14 @@ LazyJavaClassifierType@22['String'] {
 
 LazyJavaClassifierType@25['String'] {
     arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@24['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
 
 LazyJavaClassifierType@28['String'] {
     arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@24['String']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@18
 }
@@ -149,3 +149,54 @@ LazyJavaPackageFragment@65['lang'] {
     functions('foo': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@85
 }
+
+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@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+}
+
+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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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[4] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <name not found> = ArrayList@111[5] { ResolutionCandidate@108, ResolutionCandidate@109, ResolutionCandidate@110, ... }
+    <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 fab6677adb6..a8a6a5c8c84 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@23['String']
+    classifier = JavaClassImpl@15['String']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@17
 }
@@ -51,7 +51,7 @@ LazyJavaClassifierType@27['String'] {
 
 LazyJavaClassifierType@29['String'] {
     arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@15['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@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
 }
@@ -130,13 +130,152 @@ LazyJavaPackageFragment@58['lang'] {
     classes('Exception': Name@71) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@72
     classes('bar': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
     classes('foo': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('plus': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('zzz': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('zzz': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
     deserializedPackageScope = Empty@67 // through LazyPackageFragmentScopeForJavaPackage@72
     functions('Exception': Name@71) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     functions('bar': Name@73) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
     functions('foo': Name@74) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('plus': Name@75) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('zzz': Name@76) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('zzz': Name@75) = EmptyList@69[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@72
+}
+
+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]
+    <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@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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+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@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[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> = 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@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/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
index 231439aea7f..9e3ec0c7b2e 100644
--- a/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/nestedCalls/kt5971NestedSafeCall.lazy.log
@@ -35,3 +35,36 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
index 967bf172efe..2dcb6954f95 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralWithId.lazy.log
@@ -44,35 +44,325 @@ LazyJavaPackageFragment@15['<root>'] {
     classes('f': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('foo': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@39
     classes('id': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('plus': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('f': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('foo': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('id': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('invoke': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('plus': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('f': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('foo': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('id': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@22['java'] {
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('lang': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@50) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }
 
 LazyJavaPackageFragment@24['lang'] {
-    classes('f': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('foo': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('id': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('invoke': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('plus': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = Empty@47 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('f': Name@42) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('foo': Name@43) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('id': Name@44) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('invoke': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('plus': Name@46) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('f': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('foo': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('id': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('f': Name@42) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('foo': Name@43) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('id': Name@44) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@52
+}
+
+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]
+    <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]
+}
+
+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]
+    <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]
+    <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]
+}
+
+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@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+    <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]
+}
+
+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@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@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@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[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 }
+}
+
+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 }
+}
+
+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[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]
+    <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]
+    <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]
+    <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]
+    <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, ... }
+    <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 e2fb8fe28b0..16dca080cfc 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiterals.lazy.log
@@ -23,32 +23,152 @@ LazyJavaPackageFragment@6['<root>'] {
     classes('Int': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
     classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@21
     classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    classes('plus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@21
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('f': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('foo': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    functions('plus': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@21
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('lang': Name@31) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@30
+    classes('lang': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('lang': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('invoke': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    classes('plus': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@26 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('f': Name@22) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('foo': Name@23) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('invoke': Name@24) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('plus': Name@25) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('f': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    classes('foo': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@31
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('f': Name@22) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    functions('foo': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@31
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
+}
+
+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]
+    <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]
+    <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]
+    <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> = 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@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 }
+}
+
+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[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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
index 4023894d93d..47c1c49c5e2 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithFunctionLiteralsOverload.lazy.log
@@ -40,32 +40,292 @@ LazyJavaPackageFragment@14['<root>'] {
     classes('String': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
     classes('f': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
     classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('plus': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('f': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('foo': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('invoke': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('plus': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@35
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('f': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@35
 }
 
 LazyJavaPackageFragment@20['java'] {
-    classes('lang': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@46
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@46
-    functions('lang': Name@47) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@46
-    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@22['lang'] {
-    classes('f': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('plus': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@42 // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('f': Name@38) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('foo': Name@39) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('invoke': Name@40) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    functions('plus': Name@41) = EmptyList@43[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('f': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('foo': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@40 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('f': Name@38) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('foo': Name@39) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
+}
+
+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]
+    <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]
+    <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]
+    <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]
+    <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 }
+    <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 {
+    <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]
+    <name not found> = EmptyList@41[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <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> = 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@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@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@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 }
+}
+
+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 }
+}
+
+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> = 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> = 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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
index cb0a44b5400..9f618a4f954 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithGenerics.lazy.log
@@ -51,3 +51,115 @@ LazyJavaPackageFragment@23['lang'] {
     functions('foo': Name@45) = EmptyList@41[empty] // through LazyPackageFragmentScopeForJavaPackage@44
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
+
+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]
+    <name not found> = EmptyList@41[empty]
+    <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@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 }
+}
+
+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> = 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> = 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> = 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]
+    <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]
+    <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, ... }
+    <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 e88a85d4fa5..93322efb653 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithRedeclarationError.lazy.log
@@ -56,3 +56,1947 @@ LazyJavaPackageFragment@12['lang'] {
     functions('z': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+    <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 }
+    <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 }
+    <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]
+    <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 }
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+    <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@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@83 {
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@85 }
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@85 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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[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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <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]
+    <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 }
+    <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 3307034f9f6..01ccdc0cc0b 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithSpecifiedFunctionLiteralWithId.lazy.log
@@ -55,13 +55,327 @@ LazyJavaPackageFragment@30['lang'] {
     classes('f': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('foo': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('id': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('invoke': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('plus': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@51
     deserializedPackageScope = Empty@46 // through LazyPackageFragmentScopeForJavaPackage@51
     functions('f': Name@50) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     functions('foo': Name@52) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
     functions('id': Name@53) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('invoke': Name@54) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('plus': Name@55) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@54 // through LazyPackageFragmentScopeForJavaPackage@51
+}
+
+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]
+    <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]
+    <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]
+    <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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@48[empty]
+    <name not found> = EmptyList@48[empty]
+    <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]
+    <name not found> = EmptyList@48[empty]
+}
+
+ResolutionTaskHolder@109 {
+    <name not found> = ArrayList@110[1] { ResolutionCandidate@111 }
+    <name not found> = ArrayList@112[1] { ResolutionCandidate@111 }
+    <name not found> = EmptyList@48[empty]
+    <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]
+    <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@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@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@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> = 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 }
+}
+
+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[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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log b/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
index b7151a304b6..773f43dcf64 100644
--- a/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/resolveWithoutGenerics.lazy.log
@@ -47,3 +47,115 @@ LazyJavaPackageFragment@21['lang'] {
     functions('foo': Name@41) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@40
 }
+
+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]
+    <name not found> = EmptyList@37[empty]
+    <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 }
+}
+
+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 }
+}
+
+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> = 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> = 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> = 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]
+    <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]
+    <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, ... }
+    <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/elvisAsCall.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
index 2caefef3118..ffaafd98015 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/elvisAsCall.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
 }
@@ -80,21 +80,21 @@ LazyJavaClassifierType@39['Throwable'] {
 
 LazyJavaClassifierType@42['Throwable'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@38['Throwable']
+    classifier = JavaClassImpl@41['Throwable']
     nullable = 'true': Boolean@27
     typeConstructor = DeserializedClassTypeConstructor@35
 }
 
 LazyJavaClassifierType@44['Throwable'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@34['Throwable']
+    classifier = JavaClassImpl@38['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
 }
@@ -158,8 +158,7 @@ LazyJavaPackageFragment@71['lang'] {
     classes('emptyListOfA': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('equals': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('getList': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('plus': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('strangeList': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@97
+    classes('strangeList': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@97
     deserializedPackageScope = Empty@92 // through LazyPackageFragmentScopeForJavaPackage@97
     functions('Exception': Name@96) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     functions('doInt': Name@98) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
@@ -167,7 +166,276 @@ LazyJavaPackageFragment@71['lang'] {
     functions('emptyListOfA': Name@100) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     functions('equals': Name@101) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     functions('getList': Name@102) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('plus': Name@103) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('strangeList': Name@104) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@105 // through LazyPackageFragmentScopeForJavaPackage@97
+    functions('strangeList': Name@103) = EmptyList@94[empty] // through LazyPackageFragmentScopeForJavaPackage@97
+    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@97
+}
+
+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@117 {
+    <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> = 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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+    <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@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
+    <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> = 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]
+    <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 }
+    <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 }
+    <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]
+    <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]
+    <name not found> = EmptyList@94[empty]
+    <name not found> = EmptyList@94[empty]
+}
+
+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@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@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> = 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 }
+}
+
+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, ... }
+    <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 12f0be9aa55..cd85b7d2eec 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/exclExclAsCall.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
 }
@@ -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
 }
@@ -149,15 +149,168 @@ LazyJavaPackageFragment@67['lang'] {
     classes('doList': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('emptyNullableListOfA': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('id': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('plus': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('strangeNullableList': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('strangeNullableList': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = Empty@84 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('Exception': Name@88) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     functions('doInt': Name@90) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     functions('doList': Name@91) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     functions('emptyNullableListOfA': Name@92) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     functions('id': Name@93) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('plus': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('strangeNullableList': Name@95) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@89
+    functions('strangeNullableList': Name@94) = EmptyList@86[empty] // through LazyPackageFragmentScopeForJavaPackage@89
+    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@89
+}
+
+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]
+    <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]
+    <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]
+    <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 }
+    <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 }
+    <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]
+    <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@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@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[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[4] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <name not found> = ArrayList@191[5] { ResolutionCandidate@188, ResolutionCandidate@189, ResolutionCandidate@190, ... }
+    <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/reportTypeMismatchDeeplyOnBranches.lazy.log b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
index 5a4080d11c8..1a6dfc9d0f0 100644
--- a/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/specialConstructions/reportTypeMismatchDeeplyOnBranches.lazy.log
@@ -35,3 +35,253 @@ LazyJavaPackageFragment@13['lang'] {
     functions('equals': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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> = EmptyList@25[empty]
+}
+
+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@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> = 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]
+    <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 }
+    <name not found> = EmptyList@25[empty]
+    <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> = 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]
+}
+
+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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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@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@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@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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
index 6ddfa2ddbcf..9127a36caf4 100644
--- a/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/resolve/wrongNumberOfTypeArguments.lazy.log
@@ -49,3 +49,54 @@ LazyJavaPackageFragment@12['lang'] {
     functions('foo': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = ArrayList@49[1] { ResolutionCandidate@48 }
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
index f31d026388d..e9fae8bae71 100644
--- a/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/AmbiguityBetweenRootAndPackage.lazy.log
@@ -37,3 +37,12 @@ LazyJavaPackageFragment@9['lang'] {
     functions('testFun': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log b/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
index ac35a52e6eb..b268675c62c 100644
--- a/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/AmbiguousNonExtensions.lazy.log
@@ -50,3 +50,19 @@ LazyJavaPackageFragment@17['lang'] {
     functions('f': Name@25) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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 }
+    <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 94c05cbf59a..fbe44176f30 100644
--- a/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/DontImportRootScope.lazy.log
@@ -29,31 +29,170 @@ LazyJavaPackageFragmentProvider@3 {
 LazyJavaPackageFragment@5['<root>'] {
     classes('Klass': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
     classes('function': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('property': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('Klass': Name@26) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('function': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('plus': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('property': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('Klass': Name@26) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('function': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@27
 }
 
 LazyJavaPackageFragment@9['java'] {
-    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
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('Klass': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('function': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('plus': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('property': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('Klass': Name@38) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('function': Name@40) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('plus': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('property': Name@42) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('Klass': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('function': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('property': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('Klass': Name@37) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('function': Name@39) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('property': Name@41) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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]
+    <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]
+    <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> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <name not found> = EmptyList@31[empty]
+    <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 6d95d37124a..472d4d0650d 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportObjectAndUseAsSupertype.lazy.log
@@ -23,8 +23,25 @@ LazyJavaPackageFragment@10['java'] {
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('bar': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('bar': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+}
+
+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 }
+    <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 48d44e8c63e..9650f99c015 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportObjectHidesCurrentPackage.lazy.log
@@ -24,3 +24,10 @@ LazyJavaPackageFragment@9['java'] {
 LazyJavaPackageFragment@11['lang'] {
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
index 39750c85874..823a04e2055 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimes.lazy.log
@@ -23,10 +23,22 @@ LazyJavaPackageFragment@7['java'] {
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    classes('weatherToday': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('weatherToday': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('equals': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('weatherToday': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('weatherToday': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
index 2ec488f1bbf..09740151bed 100644
--- a/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/ImportTwoTimesStar.lazy.log
@@ -22,10 +22,22 @@ LazyJavaPackageFragment@7['java'] {
 }
 
 LazyJavaPackageFragment@9['lang'] {
-    classes('equals': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    classes('weatherToday': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('weatherToday': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
     deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('equals': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('weatherToday': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    functions('weatherToday': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log b/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
index 7ffd1dd92cf..a00a0a61b11 100644
--- a/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/Imports.lazy.log
@@ -94,25 +94,429 @@ LazyJavaPackageFragment@55['lang'] {
     classes('cValue': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('constant': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('dValue': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('equals': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('ext': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('f': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('fff': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('foo': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('i': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('value': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('ext': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('f': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('fff': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('foo': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('i': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('value': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@85
     deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@85
     functions('B': Name@84) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('D': Name@86) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('F': Name@87) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
     functions('bar': Name@88) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('cValue': Name@99) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('dValue': Name@100) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('equals': Name@92) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('ext': Name@93) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('f': Name@94) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('fff': Name@95) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@96) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('i': Name@101) = EmptyList@82[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@85
+    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('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
+}
+
+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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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 }
+    <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]
+    <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 }
+    <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@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]
+    <name not found> = EmptyList@82[empty]
+}
+
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
+    <name not found> = EmptyList@82[empty]
+    <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@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@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[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> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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@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]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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@176 {
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <name not found> = EmptyList@82[empty]
+    <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@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 8b7bd257b7f..e8eea930726 100644
--- a/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/NoAmbiguityBetweenRootAndPackage.lazy.log
@@ -29,3 +29,12 @@ LazyJavaPackageFragment@8['lang'] {
     functions('testFun': Name@20) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log b/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
index a3435ecffd3..520677e3ebe 100644
--- a/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/VisibilityInheritModifier.lazy.log
@@ -78,3 +78,90 @@ LazyJavaPackageFragment@38['lang'] {
     functions('self': Name@72) = EmptyList@68[empty] // through LazyPackageFragmentScopeForJavaPackage@71
     memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@71
 }
+
+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]
+    <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]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <name not found> = EmptyList@68[empty]
+    <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]
+    <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@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[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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
index 46ef3b5a65b..ceeb686d6fa 100644
--- a/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.lazy.log
@@ -64,12 +64,111 @@ LazyJavaPackageFragment@34['lang'] {
     classes('C': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
     classes('D': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
     classes('ii': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('plus': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
-    classes('size': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('size': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
     deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@59
     functions('C': Name@58) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     functions('D': Name@60) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('plus': Name@62) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    functions('size': Name@63) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('size': Name@62) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@59
+}
+
+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]
+    <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 }
+    <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@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]
+    <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@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]
+    <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@101 {
+    <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/scopes/kt1078.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
index e18e4af15ef..f6742d62468 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1078.lazy.log
@@ -26,11 +26,46 @@ LazyJavaPackageFragment@8['java'] {
 
 LazyJavaPackageFragment@10['lang'] {
     classes('B': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('bar': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('foo': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('foo': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@25
     functions('B': Name@24) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('bar': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('foo': Name@27) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('foo': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+}
+
+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]
+    <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]
+    <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@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
index cbe76261146..3b360434fe1 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1244.lazy.log
@@ -27,3 +27,47 @@ LazyJavaPackageFragment@8['lang'] {
     functions('A': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <name not found> = EmptyList@19[empty]
+    <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 31ad692dc1b..40d3b32ce57 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt151.lazy.log
@@ -41,3 +41,66 @@ LazyJavaPackageFragment@10['lang'] {
     functions('x': Name@37) = EmptyList@35[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@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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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@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@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/scopes/kt1579_map_entry.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
index 6338b219ca7..803a66706c9 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1579_map_entry.lazy.log
@@ -37,3 +37,18 @@ LazyJavaPackageFragment@20['java'] {
     functions('lang': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
index 9edc7edcf9b..d4cfdf9cacf 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1738.lazy.log
@@ -24,8 +24,48 @@ LazyJavaPackageFragment@6['java'] {
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('inc': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('inc': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+}
+
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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@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@46 {
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@48 }
+    <name not found> = ArrayList@49[1] { ResolutionCandidate@48 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
index dda92db8d23..d57584966e0 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1805.lazy.log
@@ -33,3 +33,95 @@ LazyJavaPackageFragment@10['lang'] {
     functions('SomeSubclass': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@23[empty]
+    <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> = 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@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/scopes/kt1806.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
index 446be2403f3..285c87dc9fa 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1806.lazy.log
@@ -41,3 +41,103 @@ LazyJavaPackageFragment@13['lang'] {
     functions('doSmth': Name@33) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@32
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@32
 }
+
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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> = 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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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[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]
+    <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@59 {
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@61 }
+    <name not found> = ArrayList@62[1] { ResolutionCandidate@61 }
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
index 0bd4e62993f..ef43d7e07a1 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1822.lazy.log
@@ -36,3 +36,13 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
index e0839b2ba0a..b13dfd3f7be 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt1942.lazy.log
@@ -66,3 +66,41 @@ LazyJavaPackageFragment@49['lang'] {
     classes('myValue': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
     deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@66
 }
+
+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@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]
+    <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]
+}
+
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
diff --git a/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
index c9db009e107..fd6944e779e 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt2262.lazy.log
@@ -42,3 +42,38 @@ LazyJavaPackageFragment@15['lang'] {
     classes('i': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@37
     deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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> = 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]
+    <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 }
+}
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 8e6b49dc0ac..16c3d64db84 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt250.617.10.lazy.log
@@ -13,71 +13,66 @@ LazyJavaClassDescriptor@8['AbstractCollection'] {
     defaultType = JetTypeImpl@9['AbstractCollection<1>']
     functions('add': Name@10) = ArrayList@11[1] { JavaMethodDescriptor@12['add'] } // through LazyJavaClassMemberScope@13
     memberIndex = computeMemberIndex$1@14 // through LazyJavaClassMemberScope@13
-    properties('add': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@13
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@17['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractCollection']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@15['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
 }
 
-LazyJavaClassDescriptor@19['AbstractList'] {
-    defaultType = JetTypeImpl@20['AbstractList<1>']
-    functions('add': Name@21) = ArrayList@22[2] { JavaMethodDescriptor@23['add'], JavaMethodDescriptor@24['add'] } // through LazyJavaClassMemberScope@25
-    memberIndex = computeMemberIndex$1@26 // through LazyJavaClassMemberScope@25
-    properties('add': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@28['AbstractList']
+LazyJavaClassDescriptor@17['AbstractList'] {
+    defaultType = JetTypeImpl@18['AbstractList<1>']
+    functions('add': Name@19) = ArrayList@20[2] { JavaMethodDescriptor@21['add'], JavaMethodDescriptor@22['add'] } // through LazyJavaClassMemberScope@23
+    memberIndex = computeMemberIndex$1@24 // through LazyJavaClassMemberScope@23
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@25['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@26['AbstractList']
 }
 
-LazyJavaClassDescriptor@29['ArrayList'] {
-    constructors = ArrayList@30[3] { JavaConstructorDescriptor@31['<init>'], JavaConstructorDescriptor@32['<init>'], JavaConstructorDescriptor@33['<init>'] } // through LazyJavaClassMemberScope@34
-    defaultType = JetTypeImpl@35['ArrayList<1>']
-    enumEntryIndex = LinkedHashMap@36 // through LazyJavaClassMemberScope@34
+LazyJavaClassDescriptor@27['ArrayList'] {
+    constructors = ArrayList@28[3] { JavaConstructorDescriptor@29['<init>'], JavaConstructorDescriptor@30['<init>'], JavaConstructorDescriptor@31['<init>'] } // through LazyJavaClassMemberScope@32
+    defaultType = JetTypeImpl@33['ArrayList<1>']
+    enumEntryIndex = LinkedHashMap@34 // through LazyJavaClassMemberScope@32
     functionTypeForSamInterface = null
-    functions('add': Name@15) = ArrayList@37[2] { JavaMethodDescriptor@38['add'], JavaMethodDescriptor@39['add'] } // through LazyJavaClassMemberScope@34
-    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@34
-    nestedClassIndex = LinkedHashMap@41 // through LazyJavaClassMemberScope@34
-    nestedClasses('add': Name@15) = null // through LazyJavaClassMemberScope@34
-    properties('add': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@34
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@42['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@43['ArrayList']
+    functions('add': Name@35) = ArrayList@36[2] { JavaMethodDescriptor@37['add'], JavaMethodDescriptor@38['add'] } // through LazyJavaClassMemberScope@32
+    memberIndex = computeMemberIndex$1@39 // through LazyJavaClassMemberScope@32
+    nestedClassIndex = LinkedHashMap@40 // through LazyJavaClassMemberScope@32
+    nestedClasses('add': Name@35) = null // through LazyJavaClassMemberScope@32
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@41['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@42['ArrayList']
 }
 
-LazyJavaClassDescriptor@44['HashMap'] {
-    constructors = ArrayList@45[4] { JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], JavaConstructorDescriptor@48['<init>'], ... } // through LazyJavaClassMemberScope@49
-    defaultType = JetTypeImpl@50['HashMap<2>']
+LazyJavaClassDescriptor@43['HashMap'] {
+    constructors = ArrayList@44[4] { JavaConstructorDescriptor@45['<init>'], JavaConstructorDescriptor@46['<init>'], JavaConstructorDescriptor@47['<init>'], ... } // through LazyJavaClassMemberScope@48
+    defaultType = JetTypeImpl@49['HashMap<2>']
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@51['HashMap']
+    typeConstructor = LazyJavaClassTypeConstructor@50['HashMap']
 }
 
-LazyJavaClassDescriptor@52['RandomAccess'] {
-    functions('add': Name@21) = EmptyList@16[empty] // through LazyJavaClassMemberScope@53
+LazyJavaClassDescriptor@51['RandomAccess'] {
+    functions('add': Name@19) = EmptyList@52[empty] // through LazyJavaClassMemberScope@53
     memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@53
-    properties('add': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@53
     typeConstructor = LazyJavaClassTypeConstructor@55['RandomAccess']
 }
 
 LazyJavaClassDescriptor@56['Serializable'] {
-    functions('add': Name@21) = EmptyList@16[empty] // through LazyJavaClassMemberScope@57
+    functions('add': Name@19) = EmptyList@52[empty] // through LazyJavaClassMemberScope@57
     memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@57
-    properties('add': Name@15) = EmptyList@16[empty] // through LazyJavaClassMemberScope@57
     typeConstructor = LazyJavaClassTypeConstructor@59['Serializable']
 }
 
-LazyJavaClassTypeConstructor@18['AbstractCollection'] {
+LazyJavaClassTypeConstructor@16['AbstractCollection'] {
     parameters = ArrayList@60[1] { LazyJavaTypeParameterDescriptor@61['E'] }
     supertypes = ArrayList@62[1] { LazyJavaClassifierType@63['Collection<E>'] }
 }
 
-LazyJavaClassTypeConstructor@28['AbstractList'] {
+LazyJavaClassTypeConstructor@26['AbstractList'] {
     parameters = ArrayList@64[1] { LazyJavaTypeParameterDescriptor@65['E'] }
     supertypes = ArrayList@66[2] { LazyJavaClassifierType@67['AbstractCollection<E>'], LazyJavaClassifierType@68['List<E>'] }
 }
 
-LazyJavaClassTypeConstructor@43['ArrayList'] {
+LazyJavaClassTypeConstructor@42['ArrayList'] {
     parameters = ArrayList@69[1] { LazyJavaTypeParameterDescriptor@70['E'] }
     supertypes = ArrayList@71[5] { LazyJavaClassifierType@72['AbstractList<E>'], LazyJavaClassifierType@73['List<E>'], LazyJavaClassifierType@74['RandomAccess'], ... }
 }
 
-LazyJavaClassTypeConstructor@51['HashMap'] {
+LazyJavaClassTypeConstructor@50['HashMap'] {
     parameters = ArrayList@75[2] { LazyJavaTypeParameterDescriptor@76['K'], LazyJavaTypeParameterDescriptor@77['V'] }
 }
 
@@ -95,14 +90,14 @@ LazyJavaClassifierType@67['AbstractCollection<E>'] {
     arguments = ArrayList@83[1] { TypeProjectionImpl@84 }
     classifier = JavaClassImpl@85['AbstractCollection']
     memberScope = SubstitutingScope@86
-    typeConstructor = LazyJavaClassTypeConstructor@18['AbstractCollection']
+    typeConstructor = LazyJavaClassTypeConstructor@16['AbstractCollection']
 }
 
 LazyJavaClassifierType@72['AbstractList<E>'] {
     arguments = ArrayList@87[1] { TypeProjectionImpl@88 }
     classifier = JavaClassImpl@89['AbstractList']
     memberScope = SubstitutingScope@90
-    typeConstructor = LazyJavaClassTypeConstructor@28['AbstractList']
+    typeConstructor = LazyJavaClassTypeConstructor@26['AbstractList']
 }
 
 LazyJavaClassifierType@91['Cloneable'] {
@@ -160,28 +155,28 @@ LazyJavaClassifierType@125['E'] {
     arguments = ArrayList@126[empty]
     classifier = JavaTypeParameterImpl@127['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@128['E'] {
     arguments = ArrayList@129[empty]
     classifier = JavaTypeParameterImpl@130['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@131['E'] {
     arguments = ArrayList@132[empty]
     classifier = JavaTypeParameterImpl@133['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@134['E'] {
     arguments = ArrayList@135[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@137['E'] {
@@ -195,40 +190,40 @@ LazyJavaClassifierType@140['E'] {
     arguments = ArrayList@141[empty]
     classifier = JavaTypeParameterImpl@142['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
 LazyJavaClassifierType@143['E'] {
     arguments = ArrayList@144[empty]
     classifier = JavaTypeParameterImpl@145['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@146['E'] {
     arguments = ArrayList@147[empty]
     classifier = JavaTypeParameterImpl@148['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@149['E'] {
     arguments = ArrayList@150[empty]
     classifier = JavaTypeParameterImpl@151['E']
     nullable = 'false': Boolean@101
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@152['E'] {
     arguments = ArrayList@153[empty]
-    classifier = JavaTypeParameterImpl@127['E']
+    classifier = JavaTypeParameterImpl@139['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@154['E'] {
     arguments = ArrayList@155[empty]
-    classifier = JavaTypeParameterImpl@139['E']
+    classifier = JavaTypeParameterImpl@145['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
@@ -237,68 +232,68 @@ LazyJavaClassifierType@156['E'] {
     arguments = ArrayList@157[empty]
     classifier = JavaTypeParameterImpl@136['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@158['E'] {
     arguments = ArrayList@159[empty]
     classifier = JavaTypeParameterImpl@148['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@160['E'] {
     arguments = ArrayList@161[empty]
-    classifier = JavaTypeParameterImpl@115['E']
+    classifier = JavaTypeParameterImpl@119['E']
     nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
 }
 
 LazyJavaClassifierType@162['E'] {
     arguments = ArrayList@163[empty]
-    classifier = JavaTypeParameterImpl@151['E']
+    classifier = JavaTypeParameterImpl@115['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
 LazyJavaClassifierType@164['E'] {
     arguments = ArrayList@165[empty]
-    classifier = JavaTypeParameterImpl@133['E']
+    classifier = JavaTypeParameterImpl@130['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@166['E'] {
     arguments = ArrayList@167[empty]
-    classifier = JavaTypeParameterImpl@123['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
-}
-
-LazyJavaClassifierType@168['E'] {
-    arguments = ArrayList@169[empty]
-    classifier = JavaTypeParameterImpl@119['E']
-    nullable = 'true': Boolean@107
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
-}
-
-LazyJavaClassifierType@170['E'] {
-    arguments = ArrayList@171[empty]
-    classifier = JavaTypeParameterImpl@130['E']
+    classifier = JavaTypeParameterImpl@142['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
+LazyJavaClassifierType@168['E'] {
+    arguments = ArrayList@169[empty]
+    classifier = JavaTypeParameterImpl@151['E']
+    nullable = 'true': Boolean@107
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+}
+
+LazyJavaClassifierType@170['E'] {
+    arguments = ArrayList@171[empty]
+    classifier = JavaTypeParameterImpl@133['E']
+    nullable = 'true': Boolean@107
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
+}
+
 LazyJavaClassifierType@172['E'] {
     arguments = ArrayList@173[empty]
-    classifier = JavaTypeParameterImpl@142['E']
+    classifier = JavaTypeParameterImpl@123['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
 
 LazyJavaClassifierType@174['E'] {
     arguments = ArrayList@175[empty]
-    classifier = JavaTypeParameterImpl@145['E']
+    classifier = JavaTypeParameterImpl@127['E']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
 }
@@ -319,26 +314,26 @@ LazyJavaClassifierType@180['K'] {
 
 LazyJavaClassifierType@183['K'] {
     arguments = ArrayList@184[empty]
-    classifier = JavaTypeParameterImpl@182['K']
+    classifier = JavaTypeParameterImpl@178['K']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@179
 }
 
 LazyJavaClassifierType@185['K'] {
     arguments = ArrayList@186[empty]
-    classifier = JavaTypeParameterImpl@178['K']
+    classifier = JavaTypeParameterImpl@182['K']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@179
 }
 
-LazyJavaClassifierType@73['List<E>'] {
+LazyJavaClassifierType@68['List<E>'] {
     arguments = ArrayList@187[1] { TypeProjectionImpl@188 }
     classifier = JavaClassImpl@189['List']
     memberScope = SubstitutingScope@190
     typeConstructor = DeserializedClassTypeConstructor@191
 }
 
-LazyJavaClassifierType@68['List<E>'] {
+LazyJavaClassifierType@73['List<E>'] {
     arguments = ArrayList@192[1] { TypeProjectionImpl@193 }
     classifier = JavaClassImpl@194['List']
     memberScope = SubstitutingScope@195
@@ -406,14 +401,14 @@ LazyJavaClassifierType@225['V'] {
 
 LazyJavaClassifierType@228['V'] {
     arguments = ArrayList@229[empty]
-    classifier = JavaTypeParameterImpl@227['V']
+    classifier = JavaTypeParameterImpl@223['V']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
 }
 
 LazyJavaClassifierType@230['V'] {
     arguments = ArrayList@231[empty]
-    classifier = JavaTypeParameterImpl@223['V']
+    classifier = JavaTypeParameterImpl@227['V']
     nullable = 'true': Boolean@107
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@224
 }
@@ -491,10 +486,10 @@ LazyJavaPackageFragmentProvider@232 {
     packageFragments('s': FqName@307) = null
     packageFragments('x': FqName@308) = null
     topLevelClasses(JavaClassImpl@85['AbstractCollection']) = LazyJavaClassDescriptor@8['AbstractCollection']
-    topLevelClasses(JavaClassImpl@89['AbstractList']) = LazyJavaClassDescriptor@19['AbstractList']
-    topLevelClasses(JavaClassImpl@309['ArrayList']) = LazyJavaClassDescriptor@29['ArrayList']
-    topLevelClasses(JavaClassImpl@310['HashMap']) = LazyJavaClassDescriptor@44['HashMap']
-    topLevelClasses(JavaClassImpl@217['RandomAccess']) = LazyJavaClassDescriptor@52['RandomAccess']
+    topLevelClasses(JavaClassImpl@89['AbstractList']) = LazyJavaClassDescriptor@17['AbstractList']
+    topLevelClasses(JavaClassImpl@309['ArrayList']) = LazyJavaClassDescriptor@27['ArrayList']
+    topLevelClasses(JavaClassImpl@310['HashMap']) = LazyJavaClassDescriptor@43['HashMap']
+    topLevelClasses(JavaClassImpl@217['RandomAccess']) = LazyJavaClassDescriptor@51['RandomAccess']
     topLevelClasses(JavaClassImpl@220['Serializable']) = LazyJavaClassDescriptor@56['Serializable']
 }
 
@@ -502,8 +497,8 @@ LazyJavaPackageFragment@245['java'] {
     classes('lang': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@312
     classes('util': Name@313) = null // through LazyPackageFragmentScopeForJavaPackage@312
     deserializedPackageScope = Empty@314 // through LazyPackageFragmentScopeForJavaPackage@312
-    functions('lang': Name@315) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@312
-    functions('util': Name@316) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@312
+    functions('lang': Name@315) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@312
+    functions('util': Name@316) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@312
     memberIndex = computeMemberIndex$1@317 // through LazyPackageFragmentScopeForJavaPackage@312
 }
 
@@ -512,51 +507,49 @@ LazyJavaPackageFragment@249['lang'] {
     classes('ArrayList': Name@320) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('HashMap': Name@321) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('TextElement': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@319
-    classes('add': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('children': Name@323) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('name': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('rrr': Name@325) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('s': Name@326) = null // through LazyPackageFragmentScopeForJavaPackage@319
     classes('x': Name@327) = null // through LazyPackageFragmentScopeForJavaPackage@319
     deserializedPackageScope = Empty@314 // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('$p': Name@328) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('ArrayList': Name@320) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('HashMap': Name@321) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('TextElement': Name@322) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('add': Name@15) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('name': Name@329) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('rrr': Name@330) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('s': Name@331) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
-    functions('x': Name@332) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('$p': Name@328) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('ArrayList': Name@320) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('HashMap': Name@321) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('TextElement': Name@322) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('name': Name@329) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('rrr': Name@330) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('s': Name@331) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('x': Name@332) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@319
     memberIndex = computeMemberIndex$1@333 // through LazyPackageFragmentScopeForJavaPackage@319
 }
 
 LazyJavaPackageFragment@264['util'] {
-    classes('ArrayList': Name@334) = LazyJavaClassDescriptor@29['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@335
-    classes('HashMap': Name@336) = LazyJavaClassDescriptor@44['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@335
+    classes('ArrayList': Name@334) = LazyJavaClassDescriptor@27['ArrayList'] // through LazyPackageFragmentScopeForJavaPackage@335
+    classes('HashMap': Name@336) = LazyJavaClassDescriptor@43['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@335
     deserializedPackageScope = Empty@314 // through LazyPackageFragmentScopeForJavaPackage@335
-    functions('ArrayList': Name@337) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@335
-    functions('HashMap': Name@338) = EmptyList@16[empty] // through LazyPackageFragmentScopeForJavaPackage@335
+    functions('ArrayList': Name@337) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@335
+    functions('HashMap': Name@338) = EmptyList@52[empty] // through LazyPackageFragmentScopeForJavaPackage@335
     memberIndex = computeMemberIndex$1@339 // through LazyPackageFragmentScopeForJavaPackage@335
 }
 
 LazyJavaTypeParameterDescriptor@70['E'] {
     defaultType = JetTypeImpl@340['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
     upperBounds = LinkedHashSet@341[1] { NullableType@342 }
     upperBoundsAsType = NullableType@342
 }
 
 LazyJavaTypeParameterDescriptor@61['E'] {
     defaultType = JetTypeImpl@343['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@116
     upperBounds = LinkedHashSet@344[1] { NullableType@345 }
     upperBoundsAsType = NullableType@345
 }
 
 LazyJavaTypeParameterDescriptor@65['E'] {
     defaultType = JetTypeImpl@346['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@124
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@120
     upperBounds = LinkedHashSet@347[1] { NullableType@348 }
     upperBoundsAsType = NullableType@348
 }
@@ -578,34 +571,418 @@ LazyJavaTypeParameterResolver@355 {
 }
 
 LazyJavaTypeParameterResolver@357 {
-    resolve(JavaTypeParameterImpl@358['E']) = LazyJavaTypeParameterDescriptor@65['E']
+    resolve(JavaTypeParameterImpl@358['E']) = LazyJavaTypeParameterDescriptor@61['E']
 }
 
 LazyJavaTypeParameterResolver@359 {
-    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@61['E']
+    resolve(JavaTypeParameterImpl@360['E']) = LazyJavaTypeParameterDescriptor@65['E']
 }
 
 LazyJavaTypeParameterResolver@361 {
-    resolve(JavaTypeParameterImpl@142['E']) = null
+    resolve(JavaTypeParameterImpl@139['E']) = null
 }
 
 LazyJavaTypeParameterResolver@362 {
-    resolve(JavaTypeParameterImpl@133['E']) = null
+    resolve(JavaTypeParameterImpl@142['E']) = null
 }
 
 LazyJavaTypeParameterResolver@363 {
-    resolve(JavaTypeParameterImpl@136['E']) = null
+    resolve(JavaTypeParameterImpl@133['E']) = null
 }
 
 LazyJavaTypeParameterResolver@364 {
-    resolve(JavaTypeParameterImpl@119['E']) = null
+    resolve(JavaTypeParameterImpl@148['E']) = null
 }
 
 LazyJavaTypeParameterResolver@365 {
-    resolve(JavaTypeParameterImpl@115['E']) = null
+    resolve(JavaTypeParameterImpl@130['E']) = null
 }
 
 LazyJavaTypeParameterResolver@366 {
     resolve(JavaTypeParameterImpl@367['K']) = LazyJavaTypeParameterDescriptor@76['K']
     resolve(JavaTypeParameterImpl@368['V']) = LazyJavaTypeParameterDescriptor@77['V']
 }
+
+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> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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@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[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[2] { ResolutionCandidate@437, ResolutionCandidate@438 }
+    <name not found> = ArrayList@439[2] { ResolutionCandidate@437, ResolutionCandidate@438 }
+}
+
+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 }
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@455 {
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <name not found> = EmptyList@52[empty]
+    <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@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 a7577968306..74d28392947 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt323.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@26) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+ResolutionTaskHolder@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <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 b7856de64dd..bef8b84f036 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt37.lazy.log
@@ -26,10 +26,52 @@ LazyJavaPackageFragment@6['java'] {
 
 LazyJavaPackageFragment@8['lang'] {
     classes('C': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    classes('f': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('f': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@27
     deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@27
     functions('C': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('equals': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@24[empty]
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
index 43c0307c3c4..b87549e30ae 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt421Scopes.lazy.log
@@ -35,3 +35,17 @@ LazyJavaPackageFragment@12['lang'] {
     classes('c': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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 }
+    <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 9f08b4ab63e..38038148673 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt587.lazy.log
@@ -35,3 +35,181 @@ LazyJavaPackageFragment@8['lang'] {
     functions('invoke': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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@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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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/scopes/kt900-1.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
index 0940238750c..b8b73cfdd7b 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt900-1.lazy.log
@@ -33,3 +33,48 @@ LazyJavaPackageFragment@13['lang'] {
     functions('R': Name@30) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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/scopes/kt900-2.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
index 4ff40e88cd4..5fdfa11a4dc 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt900-2.lazy.log
@@ -45,13 +45,206 @@ LazyJavaPackageFragment@21['lang'] {
     classes('T': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@42
     classes('Y': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@42
     classes('bar': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    classes('foo': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@42
     deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('B': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('R': Name@49) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('B': Name@47) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('R': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     functions('T': Name@44) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('Y': Name@50) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('Y': Name@49) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
     functions('bar': Name@46) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('foo': Name@47) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@42
+}
+
+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> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 {
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <name not found> = EmptyList@39[empty]
+    <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 ffa55040fbd..2be08290def 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt900.lazy.log
@@ -39,13 +39,258 @@ LazyJavaPackageFragment@21['lang'] {
     classes('B': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('M': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@38
     classes('P': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('bar': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('foo': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@38
     deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('B': Name@43) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('M': Name@44) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('P': Name@45) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('bar': Name@41) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('foo': Name@42) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('B': Name@37) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('M': Name@41) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    functions('P': Name@42) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@38
+}
+
+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]
+    <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]
+    <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> = 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@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[1] { ResolutionCandidate@78 }
+    <name not found> = ArrayList@79[1] { ResolutionCandidate@78 }
+}
+
+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]
+    <name not found> = EmptyList@35[empty]
+    <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> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <name not found> = EmptyList@35[empty]
+    <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 dc63014d3a3..d11bb18704f 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@30['String']
+    classifier = JavaClassImpl@21['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@40['String'] {
     arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@27['String']
+    classifier = JavaClassImpl@30['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@42['String'] {
     arguments = ArrayList@43[empty]
-    classifier = JavaClassImpl@33['String']
+    classifier = JavaClassImpl@27['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@44['String'] {
     arguments = ArrayList@45[empty]
-    classifier = JavaClassImpl@36['String']
+    classifier = JavaClassImpl@33['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
 
 LazyJavaClassifierType@46['String'] {
     arguments = ArrayList@47[empty]
-    classifier = JavaClassImpl@21['String']
+    classifier = JavaClassImpl@36['String']
     nullable = 'true': Boolean@39
     typeConstructor = DeserializedClassTypeConstructor@24
 }
@@ -128,12 +128,139 @@ LazyJavaPackageFragment@55['java'] {
 
 LazyJavaPackageFragment@57['lang'] {
     classes('System': Name@77) = LazyJavaClassDescriptor@1['System'] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('minus': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('plus': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('times': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
     deserializedPackageScope = Empty@74 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('minus': Name@79) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('plus': Name@80) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('times': Name@81) = EmptyList@9[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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 {
+    <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 }
+}
+
+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]
+}
+
+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]
+}
+
+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, ... }
+}
+
+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@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]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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@172 {
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <name not found> = EmptyList@9[empty]
+    <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/scopes/kt955.lazy.log b/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
index 673887dcf5f..7fb18ea8435 100644
--- a/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/kt955.lazy.log
@@ -53,3 +53,21 @@ LazyJavaPackageFragment@11['util'] {
     functions('bar': Name@17) = EmptyList@23[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@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 }
+    <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/stopResolutionOnAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
index 807081e589e..471406ed7b6 100644
--- a/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/stopResolutionOnAmbiguity.lazy.log
@@ -27,9 +27,22 @@ LazyJavaPackageFragment@11['java'] {
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
-LazyJavaPackageFragment@13['lang'] {
-    classes('bar': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('bar': Name@29) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+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@37 {
+    <name not found> = ArrayList@38[1] { ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[1] { ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log b/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
index ea66d991fc8..f03664cc140 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/visibility.lazy.log
@@ -62,15 +62,425 @@ LazyJavaPackageFragment@19['lang'] {
     classes('doSmth': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
     classes('f': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@57
     classes('i': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('inc': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('internal_fun': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('private_fun': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('internal_fun': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('private_fun': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@57
     deserializedPackageScope = Empty@52 // through LazyPackageFragmentScopeForJavaPackage@57
     functions('B': Name@56) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
     functions('doSmth': Name@58) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
     functions('f': Name@59) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('inc': Name@61) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('internal_fun': Name@62) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    functions('private_fun': Name@63) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('internal_fun': Name@61) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('private_fun': Name@62) = EmptyList@54[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@57
+}
+
+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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@72 {
+    <name not found> = ArrayList@73[1] { ResolutionCandidate@74 }
+    <name not found> = ArrayList@75[1] { ResolutionCandidate@74 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@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]
+    <name not found> = EmptyList@54[empty]
+    <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 }
+    <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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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@96 {
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@98 }
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@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]
+    <name not found> = EmptyList@54[empty]
+}
+
+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]
+    <name not found> = EmptyList@54[empty]
+    <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 {
+    <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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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> = 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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@54[empty]
+    <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@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@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@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@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[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 }
 }
diff --git a/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log b/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
index fa108920fca..0db548a4d0e 100644
--- a/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
+++ b/compiler/testData/diagnostics/tests/scopes/visibility2.lazy.log
@@ -404,7 +404,7 @@ LazyJavaClassifierType@389['Collection<? extends E>'] {
 
 LazyJavaClassifierType@394['Collection<? extends E>'] {
     arguments = ArrayList@395[1] { TypeProjectionImpl@396 }
-    classifier = JavaClassImpl@387['Collection']
+    classifier = JavaClassImpl@377['Collection']
     memberScope = SubstitutingScope@397
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -412,7 +412,7 @@ LazyJavaClassifierType@394['Collection<? extends E>'] {
 
 LazyJavaClassifierType@400['Collection<? extends E>'] {
     arguments = ArrayList@401[1] { TypeProjectionImpl@402 }
-    classifier = JavaClassImpl@377['Collection']
+    classifier = JavaClassImpl@392['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@392['Collection']
+    classifier = JavaClassImpl@382['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@382['Collection']
+    classifier = JavaClassImpl@387['Collection']
     memberScope = SubstitutingScope@411
     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@444['Collection']
+    classifier = JavaClassImpl@439['Collection']
     memberScope = SubstitutingScope@449
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -516,7 +516,7 @@ LazyJavaClassifierType@454['Collection<?>'] {
 
 LazyJavaClassifierType@458['Collection<?>'] {
     arguments = ArrayList@459[1] { LazyStarProjection@460 }
-    classifier = JavaClassImpl@439['Collection']
+    classifier = JavaClassImpl@419['Collection']
     memberScope = SubstitutingScope@461
     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@419['Collection']
+    classifier = JavaClassImpl@444['Collection']
     memberScope = SubstitutingScope@469
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@399
@@ -570,91 +570,91 @@ LazyJavaClassifierType@484['E'] {
     arguments = ArrayList@485[empty]
     classifier = JavaTypeParameterImpl@486['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
-LazyJavaClassifierType@488['E'] {
-    arguments = ArrayList@489[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
-}
-
-LazyJavaClassifierType@491['E'] {
-    arguments = ArrayList@492[empty]
-    classifier = JavaTypeParameterImpl@493['E']
+LazyJavaClassifierType@487['E'] {
+    arguments = ArrayList@488[empty]
+    classifier = JavaTypeParameterImpl@489['E']
     nullable = 'false': Boolean@358
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
-LazyJavaClassifierType@494['E'] {
-    arguments = ArrayList@495[empty]
-    classifier = JavaTypeParameterImpl@496['E']
+LazyJavaClassifierType@490['E'] {
+    arguments = ArrayList@491[empty]
+    classifier = JavaTypeParameterImpl@492['E']
     nullable = 'false': Boolean@358
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
+LazyJavaClassifierType@493['E'] {
+    arguments = ArrayList@494[empty]
+    classifier = JavaTypeParameterImpl@495['E']
+    nullable = 'false': Boolean@358
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+}
+
 LazyJavaClassifierType@497['E'] {
     arguments = ArrayList@498[empty]
     classifier = JavaTypeParameterImpl@499['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@500['E'] {
     arguments = ArrayList@501[empty]
     classifier = JavaTypeParameterImpl@502['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@503['E'] {
     arguments = ArrayList@504[empty]
     classifier = JavaTypeParameterImpl@505['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@506['E'] {
     arguments = ArrayList@507[empty]
     classifier = JavaTypeParameterImpl@508['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@509['E'] {
     arguments = ArrayList@510[empty]
     classifier = JavaTypeParameterImpl@511['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@512['E'] {
     arguments = ArrayList@513[empty]
     classifier = JavaTypeParameterImpl@514['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@515['E'] {
     arguments = ArrayList@516[empty]
     classifier = JavaTypeParameterImpl@517['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@518['E'] {
     arguments = ArrayList@519[empty]
     classifier = JavaTypeParameterImpl@520['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
-LazyJavaClassifierType@521['E'] {
-    arguments = ArrayList@522[empty]
-    classifier = JavaTypeParameterImpl@523['E']
+LazyJavaClassifierType@522['E'] {
+    arguments = ArrayList@523[empty]
+    classifier = JavaTypeParameterImpl@524['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@525['E'] {
@@ -668,21 +668,21 @@ LazyJavaClassifierType@528['E'] {
     arguments = ArrayList@529[empty]
     classifier = JavaTypeParameterImpl@530['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@531['E'] {
     arguments = ArrayList@532[empty]
     classifier = JavaTypeParameterImpl@533['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@534['E'] {
     arguments = ArrayList@535[empty]
     classifier = JavaTypeParameterImpl@536['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@537['E'] {
@@ -696,98 +696,98 @@ LazyJavaClassifierType@540['E'] {
     arguments = ArrayList@541[empty]
     classifier = JavaTypeParameterImpl@542['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@543['E'] {
     arguments = ArrayList@544[empty]
     classifier = JavaTypeParameterImpl@545['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@546['E'] {
     arguments = ArrayList@547[empty]
     classifier = JavaTypeParameterImpl@548['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@549['E'] {
     arguments = ArrayList@550[empty]
     classifier = JavaTypeParameterImpl@551['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@552['E'] {
     arguments = ArrayList@553[empty]
     classifier = JavaTypeParameterImpl@554['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@555['E'] {
     arguments = ArrayList@556[empty]
     classifier = JavaTypeParameterImpl@557['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@558['E'] {
     arguments = ArrayList@559[empty]
     classifier = JavaTypeParameterImpl@560['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@561['E'] {
     arguments = ArrayList@562[empty]
     classifier = JavaTypeParameterImpl@563['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@564['E'] {
     arguments = ArrayList@565[empty]
     classifier = JavaTypeParameterImpl@566['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@567['E'] {
     arguments = ArrayList@568[empty]
     classifier = JavaTypeParameterImpl@569['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@570['E'] {
     arguments = ArrayList@571[empty]
     classifier = JavaTypeParameterImpl@572['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@573['E'] {
     arguments = ArrayList@574[empty]
     classifier = JavaTypeParameterImpl@575['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@576['E'] {
     arguments = ArrayList@577[empty]
     classifier = JavaTypeParameterImpl@578['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@579['E'] {
     arguments = ArrayList@580[empty]
     classifier = JavaTypeParameterImpl@581['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 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@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@588['E'] {
     arguments = ArrayList@589[empty]
     classifier = JavaTypeParameterImpl@590['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@591['E'] {
     arguments = ArrayList@592[empty]
     classifier = JavaTypeParameterImpl@593['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@594['E'] {
     arguments = ArrayList@595[empty]
     classifier = JavaTypeParameterImpl@596['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@597['E'] {
     arguments = ArrayList@598[empty]
     classifier = JavaTypeParameterImpl@599['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@600['E'] {
     arguments = ArrayList@601[empty]
     classifier = JavaTypeParameterImpl@602['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@603['E'] {
     arguments = ArrayList@604[empty]
     classifier = JavaTypeParameterImpl@605['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@606['E'] {
     arguments = ArrayList@607[empty]
     classifier = JavaTypeParameterImpl@608['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@609['E'] {
     arguments = ArrayList@610[empty]
     classifier = JavaTypeParameterImpl@611['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@612['E'] {
     arguments = ArrayList@613[empty]
     classifier = JavaTypeParameterImpl@614['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@615['E'] {
     arguments = ArrayList@616[empty]
     classifier = JavaTypeParameterImpl@617['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@618['E'] {
     arguments = ArrayList@619[empty]
     classifier = JavaTypeParameterImpl@620['E']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@621['E'] {
     arguments = ArrayList@622[empty]
-    classifier = JavaTypeParameterImpl@590['E']
+    classifier = JavaTypeParameterImpl@605['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@623['E'] {
     arguments = ArrayList@624[empty]
-    classifier = JavaTypeParameterImpl@523['E']
+    classifier = JavaTypeParameterImpl@560['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@625['E'] {
     arguments = ArrayList@626[empty]
-    classifier = JavaTypeParameterImpl@508['E']
+    classifier = JavaTypeParameterImpl@517['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@627['E'] {
     arguments = ArrayList@628[empty]
-    classifier = JavaTypeParameterImpl@499['E']
+    classifier = JavaTypeParameterImpl@557['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@629['E'] {
     arguments = ArrayList@630[empty]
-    classifier = JavaTypeParameterImpl@502['E']
+    classifier = JavaTypeParameterImpl@514['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@631['E'] {
     arguments = ArrayList@632[empty]
-    classifier = JavaTypeParameterImpl@545['E']
+    classifier = JavaTypeParameterImpl@524['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@633['E'] {
     arguments = ArrayList@634[empty]
-    classifier = JavaTypeParameterImpl@517['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
-}
-
-LazyJavaClassifierType@635['E'] {
-    arguments = ArrayList@636[empty]
-    classifier = JavaTypeParameterImpl@611['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
-}
-
-LazyJavaClassifierType@637['E'] {
-    arguments = ArrayList@638[empty]
-    classifier = JavaTypeParameterImpl@620['E']
+    classifier = JavaTypeParameterImpl@527['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
+LazyJavaClassifierType@635['E'] {
+    arguments = ArrayList@636[empty]
+    classifier = JavaTypeParameterImpl@548['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+}
+
+LazyJavaClassifierType@637['E'] {
+    arguments = ArrayList@638[empty]
+    classifier = JavaTypeParameterImpl@495['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+}
+
 LazyJavaClassifierType@639['E'] {
     arguments = ArrayList@640[empty]
-    classifier = JavaTypeParameterImpl@496['E']
+    classifier = JavaTypeParameterImpl@478['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@641['E'] {
     arguments = ArrayList@642[empty]
-    classifier = JavaTypeParameterImpl@554['E']
+    classifier = JavaTypeParameterImpl@572['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@643['E'] {
     arguments = ArrayList@644[empty]
-    classifier = JavaTypeParameterImpl@493['E']
+    classifier = JavaTypeParameterImpl@502['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@645['E'] {
     arguments = ArrayList@646[empty]
-    classifier = JavaTypeParameterImpl@572['E']
+    classifier = JavaTypeParameterImpl@599['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@647['E'] {
     arguments = ArrayList@648[empty]
-    classifier = JavaTypeParameterImpl@533['E']
+    classifier = JavaTypeParameterImpl@590['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@649['E'] {
     arguments = ArrayList@650[empty]
-    classifier = JavaTypeParameterImpl@557['E']
+    classifier = JavaTypeParameterImpl@593['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@651['E'] {
     arguments = ArrayList@652[empty]
-    classifier = JavaTypeParameterImpl@593['E']
+    classifier = JavaTypeParameterImpl@545['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@653['E'] {
     arguments = ArrayList@654[empty]
-    classifier = JavaTypeParameterImpl@563['E']
+    classifier = JavaTypeParameterImpl@575['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@655['E'] {
     arguments = ArrayList@656[empty]
-    classifier = JavaTypeParameterImpl@587['E']
+    classifier = JavaTypeParameterImpl@530['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@657['E'] {
     arguments = ArrayList@658[empty]
-    classifier = JavaTypeParameterImpl@608['E']
+    classifier = JavaTypeParameterImpl@587['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@659['E'] {
     arguments = ArrayList@660[empty]
-    classifier = JavaTypeParameterImpl@520['E']
+    classifier = JavaTypeParameterImpl@578['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@661['E'] {
     arguments = ArrayList@662[empty]
-    classifier = JavaTypeParameterImpl@527['E']
+    classifier = JavaTypeParameterImpl@539['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@663['E'] {
     arguments = ArrayList@664[empty]
-    classifier = JavaTypeParameterImpl@599['E']
+    classifier = JavaTypeParameterImpl@520['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@665['E'] {
     arguments = ArrayList@666[empty]
-    classifier = JavaTypeParameterImpl@539['E']
+    classifier = JavaTypeParameterImpl@611['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@667['E'] {
     arguments = ArrayList@668[empty]
-    classifier = JavaTypeParameterImpl@536['E']
+    classifier = JavaTypeParameterImpl@620['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@669['E'] {
     arguments = ArrayList@670[empty]
-    classifier = JavaTypeParameterImpl@584['E']
+    classifier = JavaTypeParameterImpl@499['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@671['E'] {
     arguments = ArrayList@672[empty]
-    classifier = JavaTypeParameterImpl@490['E']
+    classifier = JavaTypeParameterImpl@508['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@673['E'] {
     arguments = ArrayList@674[empty]
-    classifier = JavaTypeParameterImpl@560['E']
+    classifier = JavaTypeParameterImpl@492['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@675['E'] {
     arguments = ArrayList@676[empty]
+    classifier = JavaTypeParameterImpl@511['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+}
+
+LazyJavaClassifierType@677['E'] {
+    arguments = ArrayList@678[empty]
+    classifier = JavaTypeParameterImpl@608['E']
+    nullable = 'true': Boolean@398
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
+}
+
+LazyJavaClassifierType@679['E'] {
+    arguments = ArrayList@680[empty]
+    classifier = JavaTypeParameterImpl@489['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']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
-LazyJavaClassifierType@677['E'] {
-    arguments = ArrayList@678[empty]
-    classifier = JavaTypeParameterImpl@514['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
-}
-
-LazyJavaClassifierType@679['E'] {
-    arguments = ArrayList@680[empty]
-    classifier = JavaTypeParameterImpl@575['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
-}
-
-LazyJavaClassifierType@681['E'] {
-    arguments = ArrayList@682[empty]
-    classifier = JavaTypeParameterImpl@578['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
-}
-
-LazyJavaClassifierType@683['E'] {
-    arguments = ArrayList@684[empty]
-    classifier = JavaTypeParameterImpl@614['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
-}
-
-LazyJavaClassifierType@685['E'] {
-    arguments = ArrayList@686[empty]
-    classifier = JavaTypeParameterImpl@486['E']
-    nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
-}
-
 LazyJavaClassifierType@687['E'] {
     arguments = ArrayList@688[empty]
-    classifier = JavaTypeParameterImpl@596['E']
+    classifier = JavaTypeParameterImpl@505['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@689['E'] {
     arguments = ArrayList@690[empty]
-    classifier = JavaTypeParameterImpl@548['E']
+    classifier = JavaTypeParameterImpl@533['E']
     nullable = 'true': Boolean@398
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@691['E'] {
     arguments = ArrayList@692[empty]
-    classifier = JavaTypeParameterImpl@602['E']
+    classifier = JavaTypeParameterImpl@584['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@693['E'] {
     arguments = ArrayList@694[empty]
-    classifier = JavaTypeParameterImpl@605['E']
+    classifier = JavaTypeParameterImpl@566['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@695['E'] {
     arguments = ArrayList@696[empty]
-    classifier = JavaTypeParameterImpl@505['E']
+    classifier = JavaTypeParameterImpl@581['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@697['E'] {
     arguments = ArrayList@698[empty]
-    classifier = JavaTypeParameterImpl@617['E']
+    classifier = JavaTypeParameterImpl@569['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@699['E'] {
     arguments = ArrayList@700[empty]
-    classifier = JavaTypeParameterImpl@581['E']
+    classifier = JavaTypeParameterImpl@551['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@701['E'] {
     arguments = ArrayList@702[empty]
-    classifier = JavaTypeParameterImpl@566['E']
+    classifier = JavaTypeParameterImpl@602['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@703['E'] {
     arguments = ArrayList@704[empty]
-    classifier = JavaTypeParameterImpl@530['E']
+    classifier = JavaTypeParameterImpl@614['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@705['E'] {
     arguments = ArrayList@706[empty]
-    classifier = JavaTypeParameterImpl@511['E']
+    classifier = JavaTypeParameterImpl@554['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
 }
 
 LazyJavaClassifierType@707['E'] {
     arguments = ArrayList@708[empty]
-    classifier = JavaTypeParameterImpl@542['E']
+    classifier = JavaTypeParameterImpl@486['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@709['E'] {
     arguments = ArrayList@710[empty]
-    classifier = JavaTypeParameterImpl@551['E']
+    classifier = JavaTypeParameterImpl@536['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@711['E'] {
     arguments = ArrayList@712[empty]
-    classifier = JavaTypeParameterImpl@569['E']
+    classifier = JavaTypeParameterImpl@563['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
 }
 
 LazyJavaClassifierType@713['E'] {
     arguments = ArrayList@714[empty]
-    classifier = JavaTypeParameterImpl@478['E']
+    classifier = JavaTypeParameterImpl@596['E']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@480
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
 }
 
 LazyJavaClassifierType@715['Iterator<E>'] {
@@ -1236,7 +1236,7 @@ LazyJavaClassifierType@726['Iterator<E>'] {
 
 LazyJavaClassifierType@731['Iterator<E>'] {
     arguments = ArrayList@732[1] { TypeProjectionImpl@733 }
-    classifier = JavaClassImpl@718['Iterator']
+    classifier = JavaClassImpl@724['Iterator']
     memberScope = SubstitutingScope@734
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@735
@@ -1244,7 +1244,7 @@ LazyJavaClassifierType@731['Iterator<E>'] {
 
 LazyJavaClassifierType@736['Iterator<E>'] {
     arguments = ArrayList@737[1] { TypeProjectionImpl@738 }
-    classifier = JavaClassImpl@729['Iterator']
+    classifier = JavaClassImpl@718['Iterator']
     memberScope = SubstitutingScope@739
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@735
@@ -1252,47 +1252,47 @@ LazyJavaClassifierType@736['Iterator<E>'] {
 
 LazyJavaClassifierType@740['Iterator<E>'] {
     arguments = ArrayList@741[1] { TypeProjectionImpl@742 }
-    classifier = JavaClassImpl@724['Iterator']
+    classifier = JavaClassImpl@729['Iterator']
     memberScope = SubstitutingScope@743
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@735
 }
 
-LazyJavaClassifierType@339['List<E>'] {
-    arguments = ArrayList@744[1] { TypeProjectionImpl@745 }
-    classifier = JavaClassImpl@746['List']
-    memberScope = SubstitutingScope@747
+LazyJavaClassifierType@744['List<E>'] {
+    arguments = ArrayList@745[1] { TypeProjectionImpl@746 }
+    classifier = JavaClassImpl@747['List']
+    memberScope = SubstitutingScope@748
     nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@748
+    typeConstructor = DeserializedClassTypeConstructor@749
 }
 
-LazyJavaClassifierType@749['List<E>'] {
-    arguments = ArrayList@750[1] { TypeProjectionImpl@751 }
-    classifier = JavaClassImpl@752['List']
-    memberScope = SubstitutingScope@753
+LazyJavaClassifierType@750['List<E>'] {
+    arguments = ArrayList@751[1] { TypeProjectionImpl@752 }
+    classifier = JavaClassImpl@753['List']
+    memberScope = SubstitutingScope@754
     nullable = 'false': Boolean@358
-    typeConstructor = DeserializedClassTypeConstructor@748
+    typeConstructor = DeserializedClassTypeConstructor@749
+}
+
+LazyJavaClassifierType@339['List<E>'] {
+    arguments = ArrayList@755[1] { TypeProjectionImpl@756 }
+    classifier = JavaClassImpl@757['List']
+    memberScope = SubstitutingScope@758
+    nullable = 'false': Boolean@358
+    typeConstructor = DeserializedClassTypeConstructor@749
 }
 
 LazyJavaClassifierType@334['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@748
+    typeConstructor = DeserializedClassTypeConstructor@749
 }
 
 LazyJavaClassifierType@763['List<E>'] {
     arguments = ArrayList@764[1] { TypeProjectionImpl@765 }
-    classifier = JavaClassImpl@761['List']
+    classifier = JavaClassImpl@753['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@752['List']
+    classifier = JavaClassImpl@747['List']
     memberScope = SubstitutingScope@771
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@767
@@ -1348,7 +1348,7 @@ LazyJavaClassifierType@793['ListIterator<E>'] {
 
 LazyJavaClassifierType@798['ListIterator<E>'] {
     arguments = ArrayList@799[1] { TypeProjectionImpl@800 }
-    classifier = JavaClassImpl@781['ListIterator']
+    classifier = JavaClassImpl@775['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@775['ListIterator']
+    classifier = JavaClassImpl@781['ListIterator']
     memberScope = SubstitutingScope@805
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@797
@@ -1482,7 +1482,7 @@ LazyJavaClassifierType@851['Object'] {
 
 LazyJavaClassifierType@854['Object'] {
     arguments = ArrayList@855[empty]
-    classifier = JavaClassImpl@829['Object']
+    classifier = JavaClassImpl@826['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@820['Object']
+    classifier = JavaClassImpl@815['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@826['Object']
+    classifier = JavaClassImpl@841['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@838['Object']
+    classifier = JavaClassImpl@844['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1522,7 +1522,7 @@ LazyJavaClassifierType@862['Object'] {
 
 LazyJavaClassifierType@864['Object'] {
     arguments = ArrayList@865[empty]
-    classifier = JavaClassImpl@841['Object']
+    classifier = JavaClassImpl@853['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1530,7 +1530,7 @@ LazyJavaClassifierType@864['Object'] {
 
 LazyJavaClassifierType@866['Object'] {
     arguments = ArrayList@867[empty]
-    classifier = JavaClassImpl@835['Object']
+    classifier = JavaClassImpl@847['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@823['Object']
+    classifier = JavaClassImpl@829['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@847['Object']
+    classifier = JavaClassImpl@823['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@853['Object']
+    classifier = JavaClassImpl@835['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@844['Object']
+    classifier = JavaClassImpl@820['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@850['Object']
+    classifier = JavaClassImpl@838['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@815['Object']
+    classifier = JavaClassImpl@850['Object']
     memberScope = DeserializedClassMemberScope@816
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@817
@@ -1673,7 +1673,7 @@ LazyJavaClassifierType@911['String'] {
 
 LazyJavaClassifierType@914['String'] {
     arguments = ArrayList@915[empty]
-    classifier = JavaClassImpl@910['String']
+    classifier = JavaClassImpl@905['String']
     memberScope = DeserializedClassMemberScope@906
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@907
@@ -1681,7 +1681,7 @@ LazyJavaClassifierType@914['String'] {
 
 LazyJavaClassifierType@916['String'] {
     arguments = ArrayList@917[empty]
-    classifier = JavaClassImpl@905['String']
+    classifier = JavaClassImpl@910['String']
     memberScope = DeserializedClassMemberScope@906
     nullable = 'true': Boolean@398
     typeConstructor = DeserializedClassTypeConstructor@907
@@ -1706,28 +1706,28 @@ LazyJavaClassifierType@924['T'] {
     arguments = ArrayList@925[empty]
     classifier = JavaTypeParameterImpl@926['T']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@927
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
 }
 
-LazyJavaClassifierType@928['T'] {
-    arguments = ArrayList@929[empty]
-    classifier = JavaTypeParameterImpl@930['T']
+LazyJavaClassifierType@927['T'] {
+    arguments = ArrayList@928[empty]
+    classifier = JavaTypeParameterImpl@929['T']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@927
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
 }
 
 LazyJavaClassifierType@931['T'] {
     arguments = ArrayList@932[empty]
     classifier = JavaTypeParameterImpl@933['T']
     nullable = 'false': Boolean@358
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
 }
 
 LazyJavaClassifierType@934['T'] {
     arguments = ArrayList@935[empty]
-    classifier = JavaTypeParameterImpl@930['T']
+    classifier = JavaTypeParameterImpl@933['T']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@927
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
 }
 
 LazyJavaClassifierType@936['T'] {
@@ -1739,16 +1739,16 @@ LazyJavaClassifierType@936['T'] {
 
 LazyJavaClassifierType@938['T'] {
     arguments = ArrayList@939[empty]
-    classifier = JavaTypeParameterImpl@933['T']
+    classifier = JavaTypeParameterImpl@929['T']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
 }
 
 LazyJavaClassifierType@940['T'] {
     arguments = ArrayList@941[empty]
     classifier = JavaTypeParameterImpl@926['T']
     nullable = 'true': Boolean@398
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@927
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@923
 }
 
 LazyJavaPackageFragmentProvider@942 {
@@ -1823,16 +1823,16 @@ LazyJavaPackageFragment@971['util'] {
     classes('Arrays': Name@999) = LazyJavaClassDescriptor@294['Arrays'] // through LazyPackageFragmentScopeForJavaPackage@998
 }
 
-LazyJavaTypeParameterDescriptor@336['E'] {
+LazyJavaTypeParameterDescriptor@327['E'] {
     defaultType = JetTypeImpl@1000['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@487
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@521
     upperBounds = LinkedHashSet@1001[1] { NullableType@1002 }
     upperBoundsAsType = NullableType@1002
 }
 
-LazyJavaTypeParameterDescriptor@327['E'] {
+LazyJavaTypeParameterDescriptor@336['E'] {
     defaultType = JetTypeImpl@1003['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@524
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@496
     upperBounds = LinkedHashSet@1004[1] { NullableType@1005 }
     upperBoundsAsType = NullableType@1005
 }
@@ -1851,7 +1851,7 @@ LazyJavaTypeParameterDescriptor@342['E'] {
 
 LazyJavaTypeParameterDescriptor@1012['T'] {
     defaultType = JetTypeImpl@1013['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@927
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@930
     upperBounds = LinkedHashSet@1014[1] { NullableType@1015 }
     upperBoundsAsType = NullableType@1015
 }
@@ -1863,7 +1863,7 @@ LazyJavaTypeParameterDescriptor@1016['T'] {
 }
 
 LazyJavaTypeParameterResolver@1019 {
-    resolve(JavaTypeParameterImpl@1020['E']) = LazyJavaTypeParameterDescriptor@331['E']
+    resolve(JavaTypeParameterImpl@1020['E']) = LazyJavaTypeParameterDescriptor@327['E']
 }
 
 LazyJavaTypeParameterResolver@1021 {
@@ -1871,111 +1871,111 @@ LazyJavaTypeParameterResolver@1021 {
 }
 
 LazyJavaTypeParameterResolver@1023 {
-    resolve(JavaTypeParameterImpl@1024['E']) = LazyJavaTypeParameterDescriptor@327['E']
+    resolve(JavaTypeParameterImpl@1024['E']) = LazyJavaTypeParameterDescriptor@342['E']
 }
 
 LazyJavaTypeParameterResolver@1025 {
-    resolve(JavaTypeParameterImpl@1026['E']) = LazyJavaTypeParameterDescriptor@342['E']
+    resolve(JavaTypeParameterImpl@1026['E']) = LazyJavaTypeParameterDescriptor@331['E']
 }
 
 LazyJavaTypeParameterResolver@1027 {
-    resolve(JavaTypeParameterImpl@584['E']) = null
+    resolve(JavaTypeParameterImpl@492['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1028 {
-    resolve(JavaTypeParameterImpl@505['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1029 {
-    resolve(JavaTypeParameterImpl@581['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1030 {
-    resolve(JavaTypeParameterImpl@569['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1031 {
-    resolve(JavaTypeParameterImpl@539['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1032 {
-    resolve(JavaTypeParameterImpl@545['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1033 {
-    resolve(JavaTypeParameterImpl@496['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1034 {
-    resolve(JavaTypeParameterImpl@530['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1035 {
-    resolve(JavaTypeParameterImpl@566['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1036 {
-    resolve(JavaTypeParameterImpl@523['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1037 {
-    resolve(JavaTypeParameterImpl@575['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1038 {
-    resolve(JavaTypeParameterImpl@483['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1039 {
-    resolve(JavaTypeParameterImpl@486['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1040 {
-    resolve(JavaTypeParameterImpl@611['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1041 {
-    resolve(JavaTypeParameterImpl@551['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1042 {
-    resolve(JavaTypeParameterImpl@593['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1043 {
-    resolve(JavaTypeParameterImpl@502['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1044 {
-    resolve(JavaTypeParameterImpl@542['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1045 {
-    resolve(JavaTypeParameterImpl@508['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1046 {
     resolve(JavaTypeParameterImpl@596['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1047 {
-    resolve(JavaTypeParameterImpl@614['E']) = null
+LazyJavaTypeParameterResolver@1029 {
+    resolve(JavaTypeParameterImpl@530['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1048 {
-    resolve(JavaTypeParameterImpl@557['E']) = null
+LazyJavaTypeParameterResolver@1030 {
+    resolve(JavaTypeParameterImpl@517['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1049 {
+LazyJavaTypeParameterResolver@1031 {
     resolve(JavaTypeParameterImpl@511['E']) = null
 }
 
+LazyJavaTypeParameterResolver@1032 {
+    resolve(JavaTypeParameterImpl@548['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@1040 {
+    resolve(JavaTypeParameterImpl@508['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1041 {
+    resolve(JavaTypeParameterImpl@536['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1042 {
+    resolve(JavaTypeParameterImpl@617['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1043 {
+    resolve(JavaTypeParameterImpl@483['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@605['E']) = null
+    resolve(JavaTypeParameterImpl@554['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1051 {
-    resolve(JavaTypeParameterImpl@493['E']) = null
+    resolve(JavaTypeParameterImpl@524['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1052 {
@@ -1985,3 +1985,172 @@ LazyJavaTypeParameterResolver@1052 {
 LazyJavaTypeParameterResolver@1054 {
     resolve(JavaTypeParameterImpl@1055['T']) = LazyJavaTypeParameterDescriptor@1016['T']
 }
+
+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]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@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]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@1064 {
+    <name not found> = ArrayList@1065[1] { ResolutionCandidate@1066 }
+    <name not found> = ArrayList@1067[1] { ResolutionCandidate@1066 }
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <name not found> = EmptyList@6[empty]
+    <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@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]
+    <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@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]
+    <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 }
+    <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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log b/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
index 3cf29d11094..01ab6fa4a13 100644
--- a/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
+++ b/compiler/testData/diagnostics/tests/script/AccessForwardDeclarationInScript.lazy.log
@@ -31,3 +31,99 @@ LazyJavaPackageFragment@7['lang'] {
     functions('y': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 bd8dcc46be8..65ab5790fff 100644
--- a/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
+++ b/compiler/testData/diagnostics/tests/script/ComplexScript.lazy.log
@@ -36,3 +36,37 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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]
+}
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log b/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
index 1f1f3234d70..904a229a373 100644
--- a/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
+++ b/compiler/testData/diagnostics/tests/senselessComparison/parenthesized.lazy.log
@@ -35,3 +35,243 @@ LazyJavaPackageFragment@8['lang'] {
     functions('equals': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+    <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]
+    <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]
+    <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 }
+    <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> = 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]
+    <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@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@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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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 }
+}
+
+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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
index b7a3403bcc2..0ee08a2c421 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowMultiDeclarationWithFunParameter.lazy.log
@@ -22,52 +22,117 @@ LazyJavaPackageFragment@4['<root>'] {
     classes('A': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
     classes('Array': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@19
     classes('Int': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    classes('toString': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@19
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('A': Name@18) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('Array': Name@20) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('component1': Name@22) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('component2': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('hasNext': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('iterator': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('next': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('plus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    functions('toString': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@19
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('A': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('Array': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
 LazyJavaPackageFragment@8['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@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@10['lang'] {
-    classes('A': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('Array': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('component1': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('component2': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('hasNext': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('iterator': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('next': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('plus': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    classes('toString': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@36
-    deserializedPackageScope = Empty@29 // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('A': Name@18) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('Array': Name@20) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('component1': Name@22) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('component2': Name@23) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('hasNext': Name@24) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('iterator': Name@25) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('next': Name@26) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('plus': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    functions('toString': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
-    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
+    classes('A': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('Array': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('A': Name@18) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('Array': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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]
+    <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@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> = 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 }
+}
+
+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> = 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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
index ce0952c6d88..91f94fb77a7 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInFunctionBody.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 10f9ecc75f7..c89a6e4f819 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowParameterInNestedBlockInFor.lazy.log
@@ -12,34 +12,31 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('hasNext': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('iterator': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('next': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('rangeTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('hasNext': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('iterator': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('next': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('rangeTo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('hasNext': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('iterator': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('next': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('rangeTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('hasNext': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('iterator': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('next': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('rangeTo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+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@29 {
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@31 }
+    <name not found> = ArrayList@32[1] { ResolutionCandidate@31 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
index cd98e0086f2..5260ffd836e 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInClosure.lazy.log
@@ -28,3 +28,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+ResolutionTaskHolder@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <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 241364f2b7f..87d01949d61 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFor.lazy.log
@@ -12,35 +12,29 @@ LazyJavaPackageFragmentProvider@2 {
     packageFragments('kotlin.jvm': FqName@12) = null
 }
 
-LazyJavaPackageFragment@4['<root>'] {
-    classes('hasNext': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('iterator': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('next': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('rangeTo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('hasNext': Name@13) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('iterator': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('next': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('rangeTo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@14
-}
-
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@15 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('lang': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('hasNext': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('iterator': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('next': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('rangeTo': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('hasNext': Name@13) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('iterator': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('next': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('rangeTo': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+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@27 {
+    <name not found> = ArrayList@28[1] { ResolutionCandidate@29 }
+    <name not found> = ArrayList@30[1] { ResolutionCandidate@29 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
index 305249ee988..ca7565a1830 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowPropertyInFunction.lazy.log
@@ -17,16 +17,16 @@ LazyJavaPackageFragmentProvider@2 {
 
 LazyJavaPackageFragment@4['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@8['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@19
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@19
+    functions('lang': Name@21) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@19
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@19
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@24
+ResolutionTaskHolder@24 {
+    <name not found> = ArrayList@25[1] { ResolutionCandidate@26 }
+    <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 10f9ecc75f7..29e69803154 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInFor.lazy.log
@@ -12,34 +12,36 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('hasNext': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('iterator': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('next': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('rangeTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('hasNext': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('iterator': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('next': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('rangeTo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('lang': Name@24) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@23
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('hasNext': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('iterator': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('next': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('rangeTo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('hasNext': Name@15) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('iterator': Name@16) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('next': Name@17) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('rangeTo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
index ce0952c6d88..91f94fb77a7 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedBlock.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 eb6d8ce2897..eab643625ac 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosure.lazy.log
@@ -24,3 +24,8 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 ce0952c6d88..972786f3d0e 100644
--- a/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
+++ b/compiler/testData/diagnostics/tests/shadowing/ShadowVariableInNestedClosureParam.lazy.log
@@ -20,3 +20,13 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
index 8650450be5b..5e7d0764072 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/afterBinaryExpr.lazy.log
@@ -27,11 +27,37 @@ LazyJavaPackageFragment@8['java'] {
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
 
-LazyJavaPackageFragment@10['lang'] {
-    classes('bar': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('bar': Name@27) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@29) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@28
+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@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@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> = ArrayList@52[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
+    <name not found> = ArrayList@55[2] { ResolutionCandidate@53, ResolutionCandidate@54 }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
index 29288d5813d..31a106faa2c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/classObjectMember.lazy.log
@@ -49,3 +49,107 @@ LazyJavaPackageFragment@13['lang'] {
     functions('useInt': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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]
+}
+
+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]
+}
+
+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@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@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]
+    <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@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 1834942ba36..0cc16eca493 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/combineWithNoSelectorInfo.lazy.log
@@ -25,11 +25,41 @@ LazyJavaPackageFragment@9['java'] {
 
 LazyJavaPackageFragment@11['lang'] {
     classes('equals': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('getMethod': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('getRequestURI': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@26
     functions('equals': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('getMethod': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('getRequestURI': Name@28) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
+}
+
+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> = EmptyList@23[empty]
+}
+
+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@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> = ArrayList@52[1] { ResolutionCandidate@53 }
+    <name not found> = ArrayList@54[1] { ResolutionCandidate@53 }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
index 2b86b028a49..ac0dd8447f7 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/dataFlowInfoForArguments.lazy.log
@@ -25,3 +25,27 @@ LazyJavaPackageFragment@9['lang'] {
     functions('bar': Name@21) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
index 385d6894696..700ebb9b30a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvisNothingRHS.lazy.log
@@ -16,29 +16,105 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Nothing': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('nn': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('foo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('nn': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('nn': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('nn': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('lang': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('lang': Name@25) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@24
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('invoke': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('nn': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@18) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('invoke': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('nn': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('foo': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('nn': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@27
+    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('foo': Name@18) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    functions('nn': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
+    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
+}
+
+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]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <name not found> = EmptyList@21[empty]
+    <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@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@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 }
+}
+
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
index bfd648c6aff..9b4eb72732a 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/elvisRHS.lazy.log
@@ -31,3 +31,42 @@ LazyJavaPackageFragment@7['lang'] {
     functions('equals': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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> = EmptyList@17[empty]
+}
+
+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@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> = 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 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
index ded103e2ca9..1d1964ae4ed 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/dependentOnPrevArg.lazy.log
@@ -29,3 +29,32 @@ LazyJavaPackageFragment@11['lang'] {
     functions('foo': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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@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@44 {
+    <name not found> = ArrayList@45[1] { ResolutionCandidate@46 }
+    <name not found> = ArrayList@47[1] { ResolutionCandidate@46 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
index 9db38f2df2a..82d818ef9ee 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/intersectionTypes.lazy.log
@@ -44,14 +44,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
 }
@@ -79,7 +79,7 @@ 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
 }
@@ -93,7 +93,7 @@ LazyJavaClassifierType@43['Throwable'] {
 
 LazyJavaClassifierType@45['Throwable'] {
     arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@40['Throwable']
+    classifier = JavaClassImpl@33['Throwable']
     nullable = 'true': Boolean@26
     typeConstructor = DeserializedClassTypeConstructor@34
 }
@@ -174,3 +174,363 @@ LazyJavaPackageFragment@72['lang'] {
     functions('use': Name@107) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@100
 }
+
+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@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]
+    <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@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]
+    <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 }
+    <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> = 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]
+    <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 }
+    <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@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@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@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@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> = 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 }
+}
+
+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[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 }
+}
+
+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, ... }
+    <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 91dd315efa8..27e08645728 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt1355.lazy.log
@@ -73,42 +73,42 @@ LazyJavaClassifierType@55['K'] {
     arguments = ArrayList@56[empty]
     classifier = JavaTypeParameterImpl@57['K']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@58['K'] {
     arguments = ArrayList@59[empty]
     classifier = JavaTypeParameterImpl@60['K']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@61['K'] {
     arguments = ArrayList@62[empty]
-    classifier = JavaTypeParameterImpl@57['K']
+    classifier = JavaTypeParameterImpl@60['K']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@64['K'] {
     arguments = ArrayList@65[empty]
-    classifier = JavaTypeParameterImpl@60['K']
+    classifier = JavaTypeParameterImpl@53['K']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@66['K'] {
     arguments = ArrayList@67[empty]
-    classifier = JavaTypeParameterImpl@48['K']
+    classifier = JavaTypeParameterImpl@57['K']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 LazyJavaClassifierType@68['K'] {
     arguments = ArrayList@69[empty]
-    classifier = JavaTypeParameterImpl@53['K']
+    classifier = JavaTypeParameterImpl@48['K']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 LazyJavaClassifierType@70['Map<? extends K, ? extends V>'] {
@@ -173,21 +173,21 @@ LazyJavaClassifierType@101['String'] {
 
 LazyJavaClassifierType@104['String'] {
     arguments = ArrayList@105[empty]
-    classifier = JavaClassImpl@96['String']
+    classifier = JavaClassImpl@103['String']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@97
 }
 
 LazyJavaClassifierType@106['String'] {
     arguments = ArrayList@107[empty]
-    classifier = JavaClassImpl@100['String']
+    classifier = JavaClassImpl@96['String']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@97
 }
 
 LazyJavaClassifierType@108['String'] {
     arguments = ArrayList@109[empty]
-    classifier = JavaClassImpl@103['String']
+    classifier = JavaClassImpl@100['String']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@97
 }
@@ -215,14 +215,14 @@ LazyJavaClassifierType@117['Throwable'] {
 
 LazyJavaClassifierType@120['Throwable'] {
     arguments = ArrayList@121[empty]
-    classifier = JavaClassImpl@116['Throwable']
+    classifier = JavaClassImpl@119['Throwable']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@113
 }
 
 LazyJavaClassifierType@122['Throwable'] {
     arguments = ArrayList@123[empty]
-    classifier = JavaClassImpl@119['Throwable']
+    classifier = JavaClassImpl@116['Throwable']
     nullable = 'true': Boolean@63
     typeConstructor = DeserializedClassTypeConstructor@113
 }
@@ -258,19 +258,19 @@ LazyJavaClassifierType@135['V'] {
     arguments = ArrayList@136[empty]
     classifier = JavaTypeParameterImpl@137['V']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@138
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
-LazyJavaClassifierType@139['V'] {
-    arguments = ArrayList@140[empty]
-    classifier = JavaTypeParameterImpl@141['V']
+LazyJavaClassifierType@138['V'] {
+    arguments = ArrayList@139[empty]
+    classifier = JavaTypeParameterImpl@140['V']
     nullable = 'false': Boolean@49
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@141
 }
 
 LazyJavaClassifierType@142['V'] {
     arguments = ArrayList@143[empty]
-    classifier = JavaTypeParameterImpl@141['V']
+    classifier = JavaTypeParameterImpl@130['V']
     nullable = 'true': Boolean@63
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
@@ -279,21 +279,21 @@ LazyJavaClassifierType@144['V'] {
     arguments = ArrayList@145[empty]
     classifier = JavaTypeParameterImpl@137['V']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@138
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@146['V'] {
     arguments = ArrayList@147[empty]
-    classifier = JavaTypeParameterImpl@130['V']
+    classifier = JavaTypeParameterImpl@134['V']
     nullable = 'true': Boolean@63
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
 }
 
 LazyJavaClassifierType@148['V'] {
     arguments = ArrayList@149[empty]
-    classifier = JavaTypeParameterImpl@134['V']
+    classifier = JavaTypeParameterImpl@140['V']
     nullable = 'true': Boolean@63
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@141
 }
 
 LazyJavaPackageFragmentProvider@150 {
@@ -364,47 +364,46 @@ LazyJavaPackageFragment@177['lang'] {
     classes('arrayListOf': Name@215) = null // through LazyPackageFragmentScopeForJavaPackage@213
     classes('attributes': Name@216) = null // through LazyPackageFragmentScopeForJavaPackage@213
     classes('equals': Name@217) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('get': Name@218) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('put': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('remove': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('set': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('set': Name@218) = null // through LazyPackageFragmentScopeForJavaPackage@213
     deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@213
     functions('Exception': Name@212) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
     functions('HashMap': Name@214) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
     functions('arrayListOf': Name@215) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
     functions('equals': Name@217) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('get': Name@218) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('put': Name@219) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('remove': Name@220) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    functions('set': Name@221) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    memberIndex = computeMemberIndex$1@222 // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('set': Name@218) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@213
+    memberIndex = computeMemberIndex$1@219 // through LazyPackageFragmentScopeForJavaPackage@213
 }
 
 LazyJavaPackageFragment@188['util'] {
-    classes('HashMap': Name@223) = LazyJavaClassDescriptor@15['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@224
-    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@224
-    functions('HashMap': Name@225) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@224
-    memberIndex = computeMemberIndex$1@226 // through LazyPackageFragmentScopeForJavaPackage@224
+    classes('HashMap': Name@220) = LazyJavaClassDescriptor@15['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@221
+    deserializedPackageScope = Empty@207 // through LazyPackageFragmentScopeForJavaPackage@221
+    functions('HashMap': Name@222) = EmptyList@209[empty] // through LazyPackageFragmentScopeForJavaPackage@221
+    memberIndex = computeMemberIndex$1@223 // through LazyPackageFragmentScopeForJavaPackage@221
 }
 
 LazyJavaTypeParameterDescriptor@34['K'] {
-    defaultType = JetTypeImpl@227['K']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
-    upperBounds = LinkedHashSet@228[1] { NullableType@229 }
+    defaultType = JetTypeImpl@224['K']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    upperBounds = LinkedHashSet@225[1] { NullableType@226 }
 }
 
 LazyJavaTypeParameterDescriptor@26['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@50
 }
 
 LazyJavaTypeParameterDescriptor@35['V'] {
-    defaultType = JetTypeImpl@230['V']
+    defaultType = JetTypeImpl@227['V']
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@131
-    upperBounds = LinkedHashSet@231[1] { NullableType@232 }
+    upperBounds = LinkedHashSet@228[1] { NullableType@229 }
 }
 
 LazyJavaTypeParameterDescriptor@27['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@138
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@141
+}
+
+LazyJavaTypeParameterResolver@230 {
+    resolve(JavaTypeParameterImpl@231['K']) = LazyJavaTypeParameterDescriptor@34['K']
+    resolve(JavaTypeParameterImpl@232['V']) = LazyJavaTypeParameterDescriptor@35['V']
 }
 
 LazyJavaTypeParameterResolver@233 {
@@ -412,7 +411,236 @@ LazyJavaTypeParameterResolver@233 {
     resolve(JavaTypeParameterImpl@235['V']) = LazyJavaTypeParameterDescriptor@27['V']
 }
 
-LazyJavaTypeParameterResolver@236 {
-    resolve(JavaTypeParameterImpl@237['K']) = LazyJavaTypeParameterDescriptor@34['K']
-    resolve(JavaTypeParameterImpl@238['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> = 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> = 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]
+    <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@254 {
+    <name not found> = ArrayList@255[1] { ResolutionCandidate@256 }
+    <name not found> = ArrayList@257[1] { ResolutionCandidate@256 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@209[empty]
+    <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@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@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@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[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[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@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> = 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]
+}
+
+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, ... }
+    <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 6bb78374c2b..3446c8a24f4 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2746.lazy.log
@@ -45,3 +45,55 @@ LazyJavaPackageFragment@10['lang'] {
     functions('f': Name@26) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <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]
+    <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 }
+}
+
+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 }
+}
+
+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/smartCasts/inference/kt2851.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
index 7f895967e61..c9ba2ace494 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt2851.lazy.log
@@ -49,3 +49,91 @@ LazyJavaPackageFragment@19['lang'] {
     functions('foo': Name@42) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@40
     memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@40
 }
+
+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@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]
+    <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]
+    <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]
+    <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@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> = 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/smartCasts/inference/kt4009.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
index d0a50baa08a..d175ec09e8e 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4009.lazy.log
@@ -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
 }
@@ -131,36 +131,110 @@ LazyJavaPackageFragment@51['<root>'] {
     classes('Exception': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
     classes('equals': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('getText': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('println': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('Exception': Name@74) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('equals': Name@76) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('getParent': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('getText': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('println': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('println': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('Exception': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('equals': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    functions('println': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@73
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('lang': Name@85) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@82
+    functions('lang': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('equals': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('getParent': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('getText': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    classes('println': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@80 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('Exception': Name@74) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('equals': Name@76) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('getParent': Name@77) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('getText': Name@78) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('println': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('Exception': Name@74) = LazyJavaClassDescriptor@2['Exception'] // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('equals': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('println': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('Exception': Name@74) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('equals': Name@76) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('println': Name@77) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@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@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@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> = 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[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@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 d53435e0243..5f0c8645569 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4403.lazy.log
@@ -36,3 +36,22 @@ LazyJavaPackageFragment@9['lang'] {
     functions('f': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
index a65850361d8..9e128883f5d 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/kt4415.lazy.log
@@ -163,14 +163,14 @@ LazyJavaClassifierType@75['Throwable'] {
 
 LazyJavaClassifierType@77['Throwable'] {
     arguments = ArrayList@78[empty]
-    classifier = JavaClassImpl@74['Throwable']
+    classifier = JavaClassImpl@71['Throwable']
     nullable = 'true': Boolean@60
     typeConstructor = DeserializedClassTypeConstructor@68
 }
 
 LazyJavaClassifierType@79['Throwable'] {
     arguments = ArrayList@80[empty]
-    classifier = JavaClassImpl@71['Throwable']
+    classifier = JavaClassImpl@74['Throwable']
     nullable = 'true': Boolean@60
     typeConstructor = DeserializedClassTypeConstructor@68
 }
@@ -223,36 +223,110 @@ LazyJavaPackageFragment@86['<root>'] {
     classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
     classes('Class': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@117
     classes('Exception': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    classes('find': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('Exception': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('find': Name@120) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@117
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('Exception': Name@119) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@117
 }
 
 LazyJavaPackageFragment@93['java'] {
-    classes('lang': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('lang': Name@126) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('lang': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('lang': Name@125) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
 LazyJavaPackageFragment@97['lang'] {
-    classes('Class': Name@118) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Exception': Name@119) = LazyJavaClassDescriptor@4['Exception'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('find': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@121 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('Exception': Name@119) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('find': Name@120) = EmptyList@122[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('Class': Name@118) = LazyJavaClassDescriptor@2['Class'] // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Exception': Name@119) = LazyJavaClassDescriptor@4['Exception'] // through LazyPackageFragmentScopeForJavaPackage@127
+    deserializedPackageScope = Empty@120 // through LazyPackageFragmentScopeForJavaPackage@127
+    functions('Exception': Name@119) = EmptyList@121[empty] // through LazyPackageFragmentScopeForJavaPackage@127
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@127
 }
 
 LazyJavaTypeParameterDescriptor@21['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@130
-    upperBounds = LinkedHashSet@131[1] { NullableType@132 }
-    upperBoundsAsType = NullableType@132
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@129
+    upperBounds = LinkedHashSet@130[1] { NullableType@131 }
+    upperBoundsAsType = NullableType@131
 }
 
-LazyJavaTypeParameterResolver@133 {
-    resolve(JavaTypeParameterImpl@134['T']) = LazyJavaTypeParameterDescriptor@21['T']
+LazyJavaTypeParameterResolver@132 {
+    resolve(JavaTypeParameterImpl@133['T']) = LazyJavaTypeParameterDescriptor@21['T']
+}
+
+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]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@121[empty]
+    <name not found> = EmptyList@121[empty]
+    <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@150 {
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@152 }
+    <name not found> = ArrayList@153[1] { ResolutionCandidate@152 }
+}
+
+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, ... }
+    <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]
+    <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/smartCastOnReceiver.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
index 5bcfe77f69e..014140b49e8 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/inference/smartCastOnReceiver.lazy.log
@@ -27,33 +27,102 @@ LazyJavaPackageFragmentProvider@2 {
 LazyJavaPackageFragment@4['<root>'] {
     classes('MutableList': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('Pair': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('add': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('to': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('Pair': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('add': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('to': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('to': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('Pair': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('to': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@11['java'] {
-    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
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('Pair': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('add': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    classes('to': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('Pair': Name@27) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('add': Name@28) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('equals': Name@29) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('to': Name@30) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('Pair': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('equals': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    classes('to': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('Pair': Name@27) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@28) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('to': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@31[empty]
+    <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]
+    <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@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 }
+}
+
+ResolutionTaskHolder@74 {
+    <name not found> = ArrayList@75[2] { ResolutionCandidate@76, ResolutionCandidate@77 }
+    <name not found> = ArrayList@78[2] { ResolutionCandidate@76, ResolutionCandidate@77 }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
index e54e5e12cc2..5c2b0ebf6ee 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt1461.lazy.log
@@ -75,21 +75,21 @@ 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
 }
 
 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@35['Throwable']
+    classifier = JavaClassImpl@31['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -142,3 +142,103 @@ LazyJavaPackageFragment@62['lang'] {
     functions('println': Name@83) = EmptyList@79[empty] // through LazyPackageFragmentScopeForJavaPackage@82
     memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@82
 }
+
+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]
+    <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 }
+    <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@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@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[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[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, ... }
+    <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 ac4aac6c833..8d083e5c361 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt2422.lazy.log
@@ -38,3 +38,296 @@ LazyJavaPackageFragment@15['lang'] {
     functions('useInt': Name@32) = EmptyList@27[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 {
+    <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@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <name not found> = EmptyList@27[empty]
+    <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 }
+    <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]
+    <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 }
+    <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> = 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> = 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 }
+    <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 }
+    <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]
+    <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@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@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@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@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 }
+}
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
index 47dade359b3..882b7460ee9 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/kt5455.lazy.log
@@ -27,29 +27,95 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('String': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@26
     classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('equals': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('foo': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('minus': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
 LazyJavaPackageFragment@9['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@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@35) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
 LazyJavaPackageFragment@11['lang'] {
-    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('foo': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    classes('minus': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@39
-    deserializedPackageScope = Empty@32 // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('equals': Name@29) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('foo': Name@30) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    functions('minus': Name@31) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@39
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('equals': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@37
+    deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@37
+    functions('equals': Name@29) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@37
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@37
+}
+
+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]
+}
+
+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@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[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> = 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 }
+}
+
+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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
index 2cfb57a392c..e592eca9d00 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/noErrorCheckForPackageLevelVal.lazy.log
@@ -43,3 +43,188 @@ LazyJavaPackageFragment@20['lang'] {
     functions('useInt': Name@37) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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> = 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 }
+    <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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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 f1936d46593..2917374f202 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/noUnnecessarySmartCastForReceiver.lazy.log
@@ -35,3 +35,31 @@ LazyJavaPackageFragment@7['lang'] {
     functions('foo': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
 }
+
+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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
index d75cf744df0..3d3c10bff6c 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/publicVal.lazy.log
@@ -41,3 +41,46 @@ LazyJavaPackageFragment@11['lang'] {
     functions('bar': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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]
+    <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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
index ce430fd1f68..89a6732187f 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabel.lazy.log
@@ -43,3 +43,280 @@ LazyJavaPackageFragment@16['lang'] {
     functions('useInt': Name@36) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@33
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@33
 }
+
+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> = 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]
+    <name not found> = EmptyList@30[empty]
+    <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 }
+    <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> = 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> = 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]
+}
+
+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@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]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <name not found> = EmptyList@30[empty]
+    <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@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]
+    <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]
+    <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> = 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@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@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@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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
index ef162b7908c..1a3f72c1e29 100644
--- a/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
+++ b/compiler/testData/diagnostics/tests/smartCasts/thisWithLabelAsReceiverPart.lazy.log
@@ -47,3 +47,330 @@ LazyJavaPackageFragment@18['lang'] {
     functions('useInt': Name@40) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@37
     memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@37
 }
+
+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> = 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]
+    <name not found> = EmptyList@34[empty]
+    <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> = 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> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[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@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 }
+    <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]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <name not found> = EmptyList@34[empty]
+    <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@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]
+    <name not found> = EmptyList@34[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@34[empty]
+    <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@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@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@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@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 }
+}
+
+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[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 }
+}
diff --git a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
index dd138810bdb..6948bf53593 100644
--- a/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/kt1558-short.lazy.log
@@ -49,3 +49,58 @@ LazyJavaPackageFragment@10['lang'] {
     functions('x': Name@33) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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@49 {
+    <name not found> = ArrayList@50[1] { ResolutionCandidate@51 }
+    <name not found> = ArrayList@52[1] { ResolutionCandidate@51 }
+}
+
+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]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <name not found> = EmptyList@32[empty]
+    <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/substitutions/kt4887.lazy.log b/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
index a62d2cf47d9..5531243b9d9 100644
--- a/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/kt4887.lazy.log
@@ -37,3 +37,29 @@ LazyJavaPackageFragment@15['lang'] {
     functions('MyClass': Name@33) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@34
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@34
 }
+
+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]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
index 865f5e079d3..87926f8f346 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithAmbiguity.lazy.log
@@ -39,3 +39,17 @@ LazyJavaPackageFragment@11['lang'] {
     functions('f': Name@21) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+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]
+    <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 f9735c0a44b..c058324694a 100644
--- a/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.lazy.log
+++ b/compiler/testData/diagnostics/tests/substitutions/upperBoundsSubstitutionForOverloadResolutionWithErrorTypes.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@38['Throwable']
+    classifier = JavaClassImpl@35['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@31['Throwable']
+    classifier = JavaClassImpl@38['Throwable']
     nullable = 'true': Boolean@24
     typeConstructor = DeserializedClassTypeConstructor@32
 }
@@ -155,3 +155,44 @@ LazyJavaPackageFragment@58['lang'] {
     functions('f1': Name@79) = EmptyList@81[empty] // through LazyPackageFragmentScopeForJavaPackage@87
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@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[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]
+    <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]
+    <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]
+    <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, ... }
+    <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 ac86b6495b8..55f5d5f7c86 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@375['Collection']
+    classifier = JavaClassImpl@360['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@365['Collection']
+    classifier = JavaClassImpl@375['Collection']
     memberScope = SubstitutingScope@386
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -394,7 +394,7 @@ LazyJavaClassifierType@383['Collection<? extends E>'] {
 
 LazyJavaClassifierType@387['Collection<? extends E>'] {
     arguments = ArrayList@388[1] { TypeProjectionImpl@389 }
-    classifier = JavaClassImpl@360['Collection']
+    classifier = JavaClassImpl@354['Collection']
     memberScope = SubstitutingScope@390
     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@354['Collection']
+    classifier = JavaClassImpl@365['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@417['Collection']
+    classifier = JavaClassImpl@412['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@407['Collection']
+    classifier = JavaClassImpl@402['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@402['Collection']
+    classifier = JavaClassImpl@407['Collection']
     memberScope = SubstitutingScope@440
     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@412['Collection']
+    classifier = JavaClassImpl@417['Collection']
     memberScope = SubstitutingScope@452
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@382
@@ -539,28 +539,28 @@ LazyJavaClassifierType@466['E'] {
     arguments = ArrayList@467[empty]
     classifier = JavaTypeParameterImpl@468['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@469['E'] {
     arguments = ArrayList@470[empty]
     classifier = JavaTypeParameterImpl@471['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@472['E'] {
     arguments = ArrayList@473[empty]
     classifier = JavaTypeParameterImpl@474['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
-LazyJavaClassifierType@475['E'] {
-    arguments = ArrayList@476[empty]
-    classifier = JavaTypeParameterImpl@477['E']
+LazyJavaClassifierType@476['E'] {
+    arguments = ArrayList@477[empty]
+    classifier = JavaTypeParameterImpl@478['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@479['E'] {
@@ -588,28 +588,28 @@ LazyJavaClassifierType@488['E'] {
     arguments = ArrayList@489[empty]
     classifier = JavaTypeParameterImpl@490['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@491['E'] {
     arguments = ArrayList@492[empty]
     classifier = JavaTypeParameterImpl@493['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@494['E'] {
     arguments = ArrayList@495[empty]
     classifier = JavaTypeParameterImpl@496['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@497['E'] {
     arguments = ArrayList@498[empty]
     classifier = JavaTypeParameterImpl@499['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@500['E'] {
@@ -630,7 +630,7 @@ LazyJavaClassifierType@506['E'] {
     arguments = ArrayList@507[empty]
     classifier = JavaTypeParameterImpl@508['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@509['E'] {
@@ -651,7 +651,7 @@ LazyJavaClassifierType@515['E'] {
     arguments = ArrayList@516[empty]
     classifier = JavaTypeParameterImpl@517['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@518['E'] {
@@ -665,42 +665,42 @@ LazyJavaClassifierType@521['E'] {
     arguments = ArrayList@522[empty]
     classifier = JavaTypeParameterImpl@523['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@524['E'] {
     arguments = ArrayList@525[empty]
     classifier = JavaTypeParameterImpl@526['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@527['E'] {
     arguments = ArrayList@528[empty]
     classifier = JavaTypeParameterImpl@529['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@530['E'] {
     arguments = ArrayList@531[empty]
     classifier = JavaTypeParameterImpl@532['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@533['E'] {
     arguments = ArrayList@534[empty]
     classifier = JavaTypeParameterImpl@535['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@536['E'] {
     arguments = ArrayList@537[empty]
     classifier = JavaTypeParameterImpl@538['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@539['E'] {
@@ -714,14 +714,14 @@ LazyJavaClassifierType@542['E'] {
     arguments = ArrayList@543[empty]
     classifier = JavaTypeParameterImpl@544['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@545['E'] {
     arguments = ArrayList@546[empty]
     classifier = JavaTypeParameterImpl@547['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@548['E'] {
@@ -756,42 +756,42 @@ LazyJavaClassifierType@560['E'] {
     arguments = ArrayList@561[empty]
     classifier = JavaTypeParameterImpl@562['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@563['E'] {
     arguments = ArrayList@564[empty]
     classifier = JavaTypeParameterImpl@565['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@566['E'] {
     arguments = ArrayList@567[empty]
     classifier = JavaTypeParameterImpl@568['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@569['E'] {
     arguments = ArrayList@570[empty]
     classifier = JavaTypeParameterImpl@571['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@572['E'] {
     arguments = ArrayList@573[empty]
     classifier = JavaTypeParameterImpl@574['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@575['E'] {
     arguments = ArrayList@576[empty]
     classifier = JavaTypeParameterImpl@577['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@578['E'] {
@@ -805,28 +805,28 @@ LazyJavaClassifierType@581['E'] {
     arguments = ArrayList@582[empty]
     classifier = JavaTypeParameterImpl@583['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@584['E'] {
     arguments = ArrayList@585[empty]
     classifier = JavaTypeParameterImpl@586['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@587['E'] {
     arguments = ArrayList@588[empty]
     classifier = JavaTypeParameterImpl@589['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@590['E'] {
     arguments = ArrayList@591[empty]
     classifier = JavaTypeParameterImpl@592['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@593['E'] {
@@ -840,334 +840,334 @@ LazyJavaClassifierType@596['E'] {
     arguments = ArrayList@597[empty]
     classifier = JavaTypeParameterImpl@598['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@599['E'] {
     arguments = ArrayList@600[empty]
     classifier = JavaTypeParameterImpl@601['E']
     nullable = 'false': Boolean@341
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@602['E'] {
     arguments = ArrayList@603[empty]
-    classifier = JavaTypeParameterImpl@505['E']
+    classifier = JavaTypeParameterImpl@565['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@604['E'] {
     arguments = ArrayList@605[empty]
-    classifier = JavaTypeParameterImpl@535['E']
+    classifier = JavaTypeParameterImpl@589['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@606['E'] {
     arguments = ArrayList@607[empty]
-    classifier = JavaTypeParameterImpl@565['E']
+    classifier = JavaTypeParameterImpl@544['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@608['E'] {
     arguments = ArrayList@609[empty]
-    classifier = JavaTypeParameterImpl@595['E']
+    classifier = JavaTypeParameterImpl@505['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@610['E'] {
     arguments = ArrayList@611[empty]
-    classifier = JavaTypeParameterImpl@514['E']
+    classifier = JavaTypeParameterImpl@532['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@612['E'] {
     arguments = ArrayList@613[empty]
-    classifier = JavaTypeParameterImpl@556['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
-}
-
-LazyJavaClassifierType@614['E'] {
-    arguments = ArrayList@615[empty]
-    classifier = JavaTypeParameterImpl@592['E']
+    classifier = JavaTypeParameterImpl@511['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
+LazyJavaClassifierType@614['E'] {
+    arguments = ArrayList@615[empty]
+    classifier = JavaTypeParameterImpl@586['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+}
+
 LazyJavaClassifierType@616['E'] {
     arguments = ArrayList@617[empty]
-    classifier = JavaTypeParameterImpl@502['E']
+    classifier = JavaTypeParameterImpl@559['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@618['E'] {
     arguments = ArrayList@619[empty]
-    classifier = JavaTypeParameterImpl@511['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@620['E'] {
-    arguments = ArrayList@621[empty]
-    classifier = JavaTypeParameterImpl@474['E']
+    classifier = JavaTypeParameterImpl@580['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
-LazyJavaClassifierType@622['E'] {
-    arguments = ArrayList@623[empty]
-    classifier = JavaTypeParameterImpl@481['E']
+LazyJavaClassifierType@620['E'] {
+    arguments = ArrayList@621[empty]
+    classifier = JavaTypeParameterImpl@538['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
+LazyJavaClassifierType@622['E'] {
+    arguments = ArrayList@623[empty]
+    classifier = JavaTypeParameterImpl@550['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+}
+
 LazyJavaClassifierType@624['E'] {
     arguments = ArrayList@625[empty]
-    classifier = JavaTypeParameterImpl@571['E']
+    classifier = JavaTypeParameterImpl@490['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@626['E'] {
     arguments = ArrayList@627[empty]
     classifier = JavaTypeParameterImpl@508['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@628['E'] {
     arguments = ArrayList@629[empty]
-    classifier = JavaTypeParameterImpl@559['E']
+    classifier = JavaTypeParameterImpl@547['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@630['E'] {
     arguments = ArrayList@631[empty]
-    classifier = JavaTypeParameterImpl@541['E']
+    classifier = JavaTypeParameterImpl@571['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@632['E'] {
     arguments = ArrayList@633[empty]
-    classifier = JavaTypeParameterImpl@477['E']
+    classifier = JavaTypeParameterImpl@478['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@634['E'] {
     arguments = ArrayList@635[empty]
-    classifier = JavaTypeParameterImpl@586['E']
+    classifier = JavaTypeParameterImpl@562['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@636['E'] {
     arguments = ArrayList@637[empty]
-    classifier = JavaTypeParameterImpl@601['E']
+    classifier = JavaTypeParameterImpl@459['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@638['E'] {
     arguments = ArrayList@639[empty]
-    classifier = JavaTypeParameterImpl@499['E']
+    classifier = JavaTypeParameterImpl@517['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@640['E'] {
     arguments = ArrayList@641[empty]
-    classifier = JavaTypeParameterImpl@547['E']
+    classifier = JavaTypeParameterImpl@523['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@642['E'] {
     arguments = ArrayList@643[empty]
-    classifier = JavaTypeParameterImpl@490['E']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
-}
-
-LazyJavaClassifierType@644['E'] {
-    arguments = ArrayList@645[empty]
-    classifier = JavaTypeParameterImpl@574['E']
+    classifier = JavaTypeParameterImpl@556['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
+LazyJavaClassifierType@644['E'] {
+    arguments = ArrayList@645[empty]
+    classifier = JavaTypeParameterImpl@598['E']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
+}
+
 LazyJavaClassifierType@646['E'] {
     arguments = ArrayList@647[empty]
-    classifier = JavaTypeParameterImpl@464['E']
+    classifier = JavaTypeParameterImpl@514['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@648['E'] {
     arguments = ArrayList@649[empty]
-    classifier = JavaTypeParameterImpl@589['E']
+    classifier = JavaTypeParameterImpl@502['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@650['E'] {
     arguments = ArrayList@651[empty]
-    classifier = JavaTypeParameterImpl@487['E']
+    classifier = JavaTypeParameterImpl@474['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@652['E'] {
     arguments = ArrayList@653[empty]
-    classifier = JavaTypeParameterImpl@553['E']
+    classifier = JavaTypeParameterImpl@499['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@654['E'] {
     arguments = ArrayList@655[empty]
-    classifier = JavaTypeParameterImpl@484['E']
+    classifier = JavaTypeParameterImpl@541['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@656['E'] {
     arguments = ArrayList@657[empty]
-    classifier = JavaTypeParameterImpl@520['E']
+    classifier = JavaTypeParameterImpl@529['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@658['E'] {
     arguments = ArrayList@659[empty]
-    classifier = JavaTypeParameterImpl@471['E']
+    classifier = JavaTypeParameterImpl@481['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@660['E'] {
     arguments = ArrayList@661[empty]
-    classifier = JavaTypeParameterImpl@544['E']
+    classifier = JavaTypeParameterImpl@487['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@662['E'] {
     arguments = ArrayList@663[empty]
-    classifier = JavaTypeParameterImpl@532['E']
+    classifier = JavaTypeParameterImpl@535['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@664['E'] {
     arguments = ArrayList@665[empty]
-    classifier = JavaTypeParameterImpl@550['E']
+    classifier = JavaTypeParameterImpl@471['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@666['E'] {
     arguments = ArrayList@667[empty]
-    classifier = JavaTypeParameterImpl@538['E']
+    classifier = JavaTypeParameterImpl@464['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@668['E'] {
     arguments = ArrayList@669[empty]
-    classifier = JavaTypeParameterImpl@580['E']
+    classifier = JavaTypeParameterImpl@583['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@670['E'] {
     arguments = ArrayList@671[empty]
-    classifier = JavaTypeParameterImpl@523['E']
+    classifier = JavaTypeParameterImpl@493['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@672['E'] {
     arguments = ArrayList@673[empty]
-    classifier = JavaTypeParameterImpl@493['E']
+    classifier = JavaTypeParameterImpl@484['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@674['E'] {
     arguments = ArrayList@675[empty]
-    classifier = JavaTypeParameterImpl@459['E']
+    classifier = JavaTypeParameterImpl@496['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@676['E'] {
     arguments = ArrayList@677[empty]
-    classifier = JavaTypeParameterImpl@583['E']
+    classifier = JavaTypeParameterImpl@526['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@678['E'] {
     arguments = ArrayList@679[empty]
     classifier = JavaTypeParameterImpl@577['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@680['E'] {
     arguments = ArrayList@681[empty]
-    classifier = JavaTypeParameterImpl@529['E']
+    classifier = JavaTypeParameterImpl@553['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@682['E'] {
     arguments = ArrayList@683[empty]
-    classifier = JavaTypeParameterImpl@562['E']
+    classifier = JavaTypeParameterImpl@592['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@684['E'] {
     arguments = ArrayList@685[empty]
-    classifier = JavaTypeParameterImpl@517['E']
+    classifier = JavaTypeParameterImpl@568['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
 
 LazyJavaClassifierType@686['E'] {
     arguments = ArrayList@687[empty]
-    classifier = JavaTypeParameterImpl@526['E']
+    classifier = JavaTypeParameterImpl@601['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
 }
 
 LazyJavaClassifierType@688['E'] {
     arguments = ArrayList@689[empty]
-    classifier = JavaTypeParameterImpl@568['E']
+    classifier = JavaTypeParameterImpl@574['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@690['E'] {
     arguments = ArrayList@691[empty]
-    classifier = JavaTypeParameterImpl@598['E']
+    classifier = JavaTypeParameterImpl@520['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@692['E'] {
     arguments = ArrayList@693[empty]
-    classifier = JavaTypeParameterImpl@496['E']
+    classifier = JavaTypeParameterImpl@595['E']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
 }
@@ -1176,7 +1176,7 @@ LazyJavaClassifierType@694['E'] {
     arguments = ArrayList@695[empty]
     classifier = JavaTypeParameterImpl@468['E']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
 }
 
 LazyJavaClassifierType@696['Iterator<E>'] {
@@ -1205,7 +1205,7 @@ LazyJavaClassifierType@707['Iterator<E>'] {
 
 LazyJavaClassifierType@712['Iterator<E>'] {
     arguments = ArrayList@713[1] { TypeProjectionImpl@714 }
-    classifier = JavaClassImpl@705['Iterator']
+    classifier = JavaClassImpl@710['Iterator']
     memberScope = SubstitutingScope@715
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@716
@@ -1213,7 +1213,7 @@ LazyJavaClassifierType@712['Iterator<E>'] {
 
 LazyJavaClassifierType@717['Iterator<E>'] {
     arguments = ArrayList@718[1] { TypeProjectionImpl@719 }
-    classifier = JavaClassImpl@710['Iterator']
+    classifier = JavaClassImpl@705['Iterator']
     memberScope = SubstitutingScope@720
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@716
@@ -1227,28 +1227,28 @@ LazyJavaClassifierType@721['Iterator<E>'] {
     typeConstructor = DeserializedClassTypeConstructor@716
 }
 
-LazyJavaClassifierType@725['List<E>'] {
-    arguments = ArrayList@726[1] { TypeProjectionImpl@727 }
-    classifier = JavaClassImpl@728['List']
-    memberScope = SubstitutingScope@729
+LazyJavaClassifierType@323['List<E>'] {
+    arguments = ArrayList@725[1] { TypeProjectionImpl@726 }
+    classifier = JavaClassImpl@727['List']
+    memberScope = SubstitutingScope@728
     nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@730
+    typeConstructor = DeserializedClassTypeConstructor@729
 }
 
 LazyJavaClassifierType@328['List<E>'] {
-    arguments = ArrayList@731[1] { TypeProjectionImpl@732 }
-    classifier = JavaClassImpl@733['List']
-    memberScope = SubstitutingScope@734
+    arguments = ArrayList@730[1] { TypeProjectionImpl@731 }
+    classifier = JavaClassImpl@732['List']
+    memberScope = SubstitutingScope@733
     nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@730
+    typeConstructor = DeserializedClassTypeConstructor@729
 }
 
-LazyJavaClassifierType@323['List<E>'] {
+LazyJavaClassifierType@734['List<E>'] {
     arguments = ArrayList@735[1] { TypeProjectionImpl@736 }
     classifier = JavaClassImpl@737['List']
     memberScope = SubstitutingScope@738
     nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@730
+    typeConstructor = DeserializedClassTypeConstructor@729
 }
 
 LazyJavaClassifierType@739['List<E>'] {
@@ -1256,7 +1256,7 @@ LazyJavaClassifierType@739['List<E>'] {
     classifier = JavaClassImpl@742['List']
     memberScope = SubstitutingScope@743
     nullable = 'false': Boolean@341
-    typeConstructor = DeserializedClassTypeConstructor@730
+    typeConstructor = DeserializedClassTypeConstructor@729
 }
 
 LazyJavaClassifierType@744['List<E>'] {
@@ -1269,7 +1269,7 @@ LazyJavaClassifierType@744['List<E>'] {
 
 LazyJavaClassifierType@749['List<E>'] {
     arguments = ArrayList@750[1] { TypeProjectionImpl@751 }
-    classifier = JavaClassImpl@728['List']
+    classifier = JavaClassImpl@737['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@756['ListIterator']
+    classifier = JavaClassImpl@767['ListIterator']
     memberScope = SubstitutingScope@777
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@778
@@ -1317,7 +1317,7 @@ LazyJavaClassifierType@774['ListIterator<E>'] {
 
 LazyJavaClassifierType@779['ListIterator<E>'] {
     arguments = ArrayList@780[1] { TypeProjectionImpl@781 }
-    classifier = JavaClassImpl@762['ListIterator']
+    classifier = JavaClassImpl@772['ListIterator']
     memberScope = SubstitutingScope@782
     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@767['ListIterator']
+    classifier = JavaClassImpl@756['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@772['ListIterator']
+    classifier = JavaClassImpl@762['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@804['Object']
+    classifier = JavaClassImpl@807['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@816['Object']
+    classifier = JavaClassImpl@819['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@831['Object']
+    classifier = JavaClassImpl@793['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@793['Object']
+    classifier = JavaClassImpl@801['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@801['Object']
+    classifier = JavaClassImpl@822['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@819['Object']
+    classifier = JavaClassImpl@810['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@822['Object']
+    classifier = JavaClassImpl@816['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@810['Object']
+    classifier = JavaClassImpl@828['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@798['Object']
+    classifier = JavaClassImpl@804['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@813['Object']
+    classifier = JavaClassImpl@825['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@807['Object']
+    classifier = JavaClassImpl@813['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@825['Object']
+    classifier = JavaClassImpl@831['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@828['Object']
+    classifier = JavaClassImpl@798['Object']
     memberScope = DeserializedClassMemberScope@794
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@795
@@ -1644,7 +1644,7 @@ LazyJavaClassifierType@892['String'] {
 
 LazyJavaClassifierType@894['String'] {
     arguments = ArrayList@895[empty]
-    classifier = JavaClassImpl@888['String']
+    classifier = JavaClassImpl@891['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@891['String']
+    classifier = JavaClassImpl@888['String']
     memberScope = DeserializedClassMemberScope@884
     nullable = 'true': Boolean@381
     typeConstructor = DeserializedClassTypeConstructor@885
@@ -1688,30 +1688,30 @@ LazyJavaClassifierType@909['T'] {
 
 LazyJavaClassifierType@912['T'] {
     arguments = ArrayList@913[empty]
-    classifier = JavaTypeParameterImpl@911['T']
-    nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
-}
-
-LazyJavaClassifierType@914['T'] {
-    arguments = ArrayList@915[empty]
     classifier = JavaTypeParameterImpl@908['T']
     nullable = 'true': Boolean@381
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
 }
 
+LazyJavaClassifierType@914['T'] {
+    arguments = ArrayList@915[empty]
+    classifier = JavaTypeParameterImpl@911['T']
+    nullable = 'true': Boolean@381
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
+}
+
 LazyJavaClassifierType@916['T'] {
     arguments = ArrayList@917[empty]
-    classifier = JavaTypeParameterImpl@904['T']
+    classifier = JavaTypeParameterImpl@900['T']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
 }
 
 LazyJavaClassifierType@918['T'] {
     arguments = ArrayList@919[empty]
-    classifier = JavaTypeParameterImpl@900['T']
+    classifier = JavaTypeParameterImpl@904['T']
     nullable = 'true': Boolean@381
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
 }
 
 LazyJavaPackageFragmentProvider@920 {
@@ -1786,36 +1786,36 @@ LazyJavaPackageFragment@943['util'] {
     memberIndex = computeMemberIndex$1@974 // through LazyPackageFragmentScopeForJavaPackage@972
 }
 
-LazyJavaTypeParameterDescriptor@316['E'] {
+LazyJavaTypeParameterDescriptor@320['E'] {
     defaultType = JetTypeImpl@975['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@478
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
     upperBounds = LinkedHashSet@976[1] { NullableType@977 }
     upperBoundsAsType = NullableType@977
 }
 
-LazyJavaTypeParameterDescriptor@320['E'] {
+LazyJavaTypeParameterDescriptor@325['E'] {
     defaultType = JetTypeImpl@978['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@461
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
     upperBounds = LinkedHashSet@979[1] { NullableType@980 }
     upperBoundsAsType = NullableType@980
 }
 
-LazyJavaTypeParameterDescriptor@325['E'] {
+LazyJavaTypeParameterDescriptor@316['E'] {
     defaultType = JetTypeImpl@981['E']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@465
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@475
     upperBounds = LinkedHashSet@982[1] { NullableType@983 }
     upperBoundsAsType = NullableType@983
 }
 
 LazyJavaTypeParameterDescriptor@984['T'] {
     defaultType = JetTypeImpl@985['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
     upperBounds = LinkedHashSet@986[1] { NullableType@987 }
     upperBoundsAsType = NullableType@987
 }
 
 LazyJavaTypeParameterDescriptor@988['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@901
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@905
     upperBounds = LinkedHashSet@989[1] { NullableType@990 }
     upperBoundsAsType = NullableType@990
 }
@@ -1825,111 +1825,111 @@ LazyJavaTypeParameterResolver@991 {
 }
 
 LazyJavaTypeParameterResolver@993 {
-    resolve(JavaTypeParameterImpl@994['E']) = LazyJavaTypeParameterDescriptor@316['E']
+    resolve(JavaTypeParameterImpl@994['E']) = LazyJavaTypeParameterDescriptor@325['E']
 }
 
 LazyJavaTypeParameterResolver@995 {
-    resolve(JavaTypeParameterImpl@996['E']) = LazyJavaTypeParameterDescriptor@325['E']
+    resolve(JavaTypeParameterImpl@996['E']) = LazyJavaTypeParameterDescriptor@316['E']
 }
 
 LazyJavaTypeParameterResolver@997 {
-    resolve(JavaTypeParameterImpl@517['E']) = null
-}
-
-LazyJavaTypeParameterResolver@998 {
-    resolve(JavaTypeParameterImpl@499['E']) = null
-}
-
-LazyJavaTypeParameterResolver@999 {
-    resolve(JavaTypeParameterImpl@508['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1000 {
-    resolve(JavaTypeParameterImpl@490['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1001 {
-    resolve(JavaTypeParameterImpl@484['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1002 {
-    resolve(JavaTypeParameterImpl@520['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1003 {
-    resolve(JavaTypeParameterImpl@595['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1004 {
-    resolve(JavaTypeParameterImpl@568['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1005 {
-    resolve(JavaTypeParameterImpl@532['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1006 {
-    resolve(JavaTypeParameterImpl@464['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1007 {
-    resolve(JavaTypeParameterImpl@496['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1008 {
-    resolve(JavaTypeParameterImpl@583['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1009 {
     resolve(JavaTypeParameterImpl@586['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1010 {
-    resolve(JavaTypeParameterImpl@474['E']) = null
+LazyJavaTypeParameterResolver@998 {
+    resolve(JavaTypeParameterImpl@520['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1011 {
-    resolve(JavaTypeParameterImpl@565['E']) = null
+LazyJavaTypeParameterResolver@999 {
+    resolve(JavaTypeParameterImpl@577['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1012 {
-    resolve(JavaTypeParameterImpl@511['E']) = null
+LazyJavaTypeParameterResolver@1000 {
+    resolve(JavaTypeParameterImpl@544['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1013 {
-    resolve(JavaTypeParameterImpl@547['E']) = null
+LazyJavaTypeParameterResolver@1001 {
+    resolve(JavaTypeParameterImpl@502['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1014 {
-    resolve(JavaTypeParameterImpl@550['E']) = null
+LazyJavaTypeParameterResolver@1002 {
+    resolve(JavaTypeParameterImpl@490['E']) = null
 }
 
-LazyJavaTypeParameterResolver@1015 {
-    resolve(JavaTypeParameterImpl@562['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1016 {
-    resolve(JavaTypeParameterImpl@505['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1017 {
-    resolve(JavaTypeParameterImpl@477['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1018 {
-    resolve(JavaTypeParameterImpl@538['E']) = null
-}
-
-LazyJavaTypeParameterResolver@1019 {
+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@1010 {
+    resolve(JavaTypeParameterImpl@499['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1011 {
+    resolve(JavaTypeParameterImpl@468['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1012 {
+    resolve(JavaTypeParameterImpl@550['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1013 {
+    resolve(JavaTypeParameterImpl@565['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1014 {
+    resolve(JavaTypeParameterImpl@517['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1015 {
+    resolve(JavaTypeParameterImpl@493['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1016 {
+    resolve(JavaTypeParameterImpl@556['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1017 {
+    resolve(JavaTypeParameterImpl@562['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1018 {
+    resolve(JavaTypeParameterImpl@595['E']) = null
+}
+
+LazyJavaTypeParameterResolver@1019 {
+    resolve(JavaTypeParameterImpl@474['E']) = null
+}
+
 LazyJavaTypeParameterResolver@1020 {
-    resolve(JavaTypeParameterImpl@481['E']) = null
+    resolve(JavaTypeParameterImpl@535['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1021 {
-    resolve(JavaTypeParameterImpl@577['E']) = null
+    resolve(JavaTypeParameterImpl@484['E']) = null
 }
 
 LazyJavaTypeParameterResolver@1022 {
@@ -1939,3 +1939,17 @@ LazyJavaTypeParameterResolver@1022 {
 LazyJavaTypeParameterResolver@1024 {
     resolve(JavaTypeParameterImpl@1025['T']) = LazyJavaTypeParameterDescriptor@988['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 }
+}
diff --git a/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log b/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
index 39ed7f72080..02b95ae17fc 100644
--- a/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/kt2069.lazy.log
@@ -20,9 +20,7 @@ LazyJavaPackageFragment@5['java'] {
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('foo': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@22) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+ResolutionTaskHolder@22 {
+    <name not found> = ArrayList@23[1] { ResolutionCandidate@24 }
+    <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 5a098c646c7..62831aa36ca 100644
--- a/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/localAnonymousObjects.lazy.log
@@ -21,3 +21,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
     memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
 }
+
+ResolutionTaskHolder@20 {
+    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+    <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 374e6fbbe43..df7fb8eacfd 100644
--- a/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/localClasses.lazy.log
@@ -32,13 +32,82 @@ LazyJavaPackageFragment@11['lang'] {
     classes('A': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('run': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
     deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
     functions('A': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     functions('f': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     functions('foo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@33) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('run': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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]
+    <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]
+    <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@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 }
+    <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 872f886ba51..0cd6e1dacbe 100644
--- a/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/memberAnonymousObjects.lazy.log
@@ -36,3 +36,10 @@ LazyJavaPackageFragment@13['lang'] {
     classes('x': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
index fd8be865d9b..9ef9cf20ffa 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedIntoLocalClasses.lazy.log
@@ -48,13 +48,92 @@ LazyJavaPackageFragment@17['lang'] {
     classes('A': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
     classes('f': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@35
     classes('foo': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('invoke': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    classes('run': Name@39) = null // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('run': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@35
     deserializedPackageScope = Empty@30 // through LazyPackageFragmentScopeForJavaPackage@35
     functions('A': Name@34) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     functions('f': Name@36) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
     functions('foo': Name@37) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('invoke': Name@38) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('run': Name@39) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@35
+    functions('run': Name@38) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@35
+    memberIndex = computeMemberIndex$1@39 // through LazyPackageFragmentScopeForJavaPackage@35
+}
+
+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]
+    <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 }
+    <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 {
+    <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@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@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]
+    <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 }
+    <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 5719b57b051..b4bb5ea34fb 100644
--- a/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/nestedLocalClasses.lazy.log
@@ -30,17 +30,94 @@ LazyJavaPackageFragment@9['java'] {
 
 LazyJavaPackageFragment@11['lang'] {
     classes('A': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('B': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('f': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('foo': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('run': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('f': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('foo': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('run': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
     deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@29
     functions('A': Name@28) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('B': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('foo': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@33) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('run': Name@34) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('f': Name@30) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('foo': Name@31) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    functions('run': Name@32) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@29
+    memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
+}
+
+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]
+    <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]
+    <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@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[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]
+    <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 }
+    <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 eb4dbf19977..397c093acfa 100644
--- a/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
+++ b/compiler/testData/diagnostics/tests/subtyping/topLevelAnonymousObjects.lazy.log
@@ -36,3 +36,10 @@ LazyJavaPackageFragment@12['lang'] {
     classes('x': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
     deserializedPackageScope = Empty@19 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
index 135cc7c3c8f..0f478ce3704 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClass.lazy.log
@@ -23,16 +23,21 @@ LazyJavaPackageFragmentProvider@5 {
 LazyJavaPackageFragment@7['<root>'] {
     classes('String': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
     classes('suppress': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
+    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@26
+    functions('lang': Name@28) = EmptyList@29[empty] // through LazyPackageFragmentScopeForJavaPackage@26
+    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@26
 }
 
-LazyJavaPackageFragment@13['lang'] {
-    deserializedPackageScope = Empty@25 // through LazyPackageFragmentScopeForJavaPackage@31
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
index 1f8cd5b4e4c..b0b7decc8cc 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnClassObject.lazy.log
@@ -39,3 +39,8 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <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 0cd6885cc0b..02ae581e7ab 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnExpression.lazy.log
@@ -30,3 +30,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <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 5dfd1777841..db58bd9b34e 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnFunction.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@11['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 }
+    <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 5dfd1777841..db58bd9b34e 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnObject.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@11['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 }
+    <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 5dfd1777841..db58bd9b34e 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnParameter.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@11['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 }
+    <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 1f8cd5b4e4c..b0b7decc8cc 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnProperty.lazy.log
@@ -39,3 +39,8 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <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 0446ff695e5..0e797837951 100644
--- a/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/allWarnings/suppressWarningsOnPropertyAccessor.lazy.log
@@ -35,3 +35,8 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <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 1e0eb13d768..a1acad05283 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/mixed.lazy.log
@@ -37,3 +37,18 @@ LazyJavaPackageFragment@15['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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@43 {
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@45 }
+    <name not found> = ArrayList@46[1] { ResolutionCandidate@45 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
index 5dfd1777841..0f478ce3704 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClass.lazy.log
@@ -31,3 +31,13 @@ LazyJavaPackageFragment@11['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 }
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
index 04b16582f76..a92b435abda 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onClassObject.lazy.log
@@ -35,3 +35,13 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
index 6b1ca042d5a..732b75cec34 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onExpression.lazy.log
@@ -34,3 +34,13 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
index 5dfd1777841..0f478ce3704 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onFunction.lazy.log
@@ -31,3 +31,13 @@ LazyJavaPackageFragment@11['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 }
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
index 5dfd1777841..0f478ce3704 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onObject.lazy.log
@@ -31,3 +31,13 @@ LazyJavaPackageFragment@11['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 }
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
index 13221420abe..8f2004b76d0 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onParameter.lazy.log
@@ -27,16 +27,26 @@ LazyJavaPackageFragmentProvider@7 {
 LazyJavaPackageFragment@9['<root>'] {
     classes('String': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
     classes('suppress': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@28) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('lang': Name@30) = EmptyList@31[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@32 // through LazyPackageFragmentScopeForJavaPackage@29
+    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@15['lang'] {
-    deserializedPackageScope = Empty@27 // through LazyPackageFragmentScopeForJavaPackage@33
+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@41 {
+    <name not found> = ArrayList@42[1] { ResolutionCandidate@43 }
+    <name not found> = ArrayList@44[1] { ResolutionCandidate@43 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
index 04b16582f76..a92b435abda 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onProperty.lazy.log
@@ -35,3 +35,13 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
index 5dfd1777841..0f478ce3704 100644
--- a/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/manyWarnings/onPropertyAccessor.lazy.log
@@ -31,3 +31,13 @@ LazyJavaPackageFragment@11['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 }
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
index 0446ff695e5..0e797837951 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClass.lazy.log
@@ -35,3 +35,8 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <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 1f8cd5b4e4c..b0b7decc8cc 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onClassObject.lazy.log
@@ -39,3 +39,8 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <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 3ae3b7218d0..3003faf0348 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onExpression.lazy.log
@@ -34,3 +34,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@31) = EmptyList@32[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@33 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+ResolutionTaskHolder@34 {
+    <name not found> = ArrayList@35[1] { ResolutionCandidate@36 }
+    <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 0446ff695e5..0e797837951 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onFunction.lazy.log
@@ -35,3 +35,8 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <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 c928069ce38..555a2f5425c 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onLocalVariable.lazy.log
@@ -31,16 +31,21 @@ LazyJavaPackageFragment@7['<root>'] {
     classes('Nothing': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('suppress': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@13['java'] {
-    classes('lang': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@35
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@35
-    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@35
-    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@35
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
-LazyJavaPackageFragment@15['lang'] {
-    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@39
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
index 0446ff695e5..0e797837951 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onObject.lazy.log
@@ -35,3 +35,8 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <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 a486d2889eb..b5a07299be7 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onParameter.lazy.log
@@ -31,16 +31,21 @@ LazyJavaPackageFragment@9['<root>'] {
     classes('Nothing': Name@27) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('String': Name@29) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('suppress': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@14['java'] {
-    classes('lang': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@33
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@33
-    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@33
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@33
+    classes('lang': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@32
+    deserializedPackageScope = Empty@33 // through LazyPackageFragmentScopeForJavaPackage@32
+    functions('lang': Name@34) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@32
+    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@32
 }
 
-LazyJavaPackageFragment@16['lang'] {
-    deserializedPackageScope = Empty@31 // through LazyPackageFragmentScopeForJavaPackage@37
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log b/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
index 1f8cd5b4e4c..b0b7decc8cc 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onProperty.lazy.log
@@ -39,3 +39,8 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <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 0446ff695e5..0e797837951 100644
--- a/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
+++ b/compiler/testData/diagnostics/tests/suppress/oneWarning/onPropertyAccessor.lazy.log
@@ -35,3 +35,8 @@ LazyJavaPackageFragment@12['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+ResolutionTaskHolder@35 {
+    <name not found> = ArrayList@36[1] { ResolutionCandidate@37 }
+    <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 165d99f6010..50b450e57aa 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/QualifiedThis.lazy.log
@@ -38,3 +38,22 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@18) = EmptyList@20[empty] // through LazyPackageFragmentScopeForJavaPackage@26
     memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@26
 }
+
+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@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@38 }
+}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
index ea6834bc48a..a80a960b962 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/Super.lazy.log
@@ -53,10 +53,199 @@ LazyJavaPackageFragment@24['java'] {
 LazyJavaPackageFragment@26['lang'] {
     classes('E': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@53
     classes('UR': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('bar': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
-    classes('foo': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
     deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('bar': Name@55) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    functions('foo': Name@56) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@53
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('foo': Name@55) = EmptyList@50[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@53
+}
+
+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@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 }
+}
+
+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 }
+}
+
+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[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 }
+}
+
+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]
+    <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]
+    <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]
+}
+
+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]
+    <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/thisAndSuper/notAccessibleSuperInTrait.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
index e185e3be024..1fccbb0551b 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/notAccessibleSuperInTrait.lazy.log
@@ -11,23 +11,14 @@ LazyJavaPackageFragmentProvider@0 {
     packageFragments('kotlin.jvm': FqName@13) = null
 }
 
-LazyJavaPackageFragment@2['<root>'] {
-    classes('foo': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
-    functions('foo': Name@14) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@15
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@15
-}
-
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@15
+    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@15
+    functions('lang': Name@17) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@15
+    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@15
 }
 
-LazyJavaPackageFragment@8['lang'] {
-    classes('foo': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@14) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+ResolutionTaskHolder@20 {
+    <name not found> = ArrayList@21[1] { ResolutionCandidate@22 }
+    <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 90dc0890424..7cd9c72d0ee 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunction.lazy.log
@@ -12,22 +12,21 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('String': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('compareTo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('compareTo': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('compareTo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('compareTo': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
index 6d0ba011d99..deb325dba95 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superInExtensionFunctionCall.lazy.log
@@ -28,3 +28,46 @@ LazyJavaPackageFragment@7['lang'] {
     functions('identityEquals': Name@11) = EmptyList@14[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@21 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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]
+    <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]
+    <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 b42141e90ca..309789614f5 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superInToplevelFunction.lazy.log
@@ -12,22 +12,21 @@ LazyJavaPackageFragmentProvider@0 {
 
 LazyJavaPackageFragment@2['<root>'] {
     classes('Nothing': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('foo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('foo': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@18 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('lang': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@22 // through LazyPackageFragmentScopeForJavaPackage@20
+    classes('lang': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@16
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@16
+    functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
+    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
 
-LazyJavaPackageFragment@7['lang'] {
-    classes('foo': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@23
-    deserializedPackageScope = Empty@16 // through LazyPackageFragmentScopeForJavaPackage@23
-    functions('foo': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
+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 }
 }
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
index 11135564699..624f74abb31 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/superIsNotAnExpression.lazy.log
@@ -31,3 +31,17 @@ LazyJavaPackageFragment@7['lang'] {
     functions('any': Name@15) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@23
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@23
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log b/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
index f935ab3c6b6..caa78259d52 100644
--- a/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/thisAndSuper/thisInFunctionLiterals.lazy.log
@@ -30,22 +30,26 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Char': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('Double': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@29
     classes('Int': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('plus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('plus': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@36 // through LazyPackageFragmentScopeForJavaPackage@29
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@38
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@38
-    functions('lang': Name@39) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@38
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@38
+    classes('lang': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@34
+    deserializedPackageScope = Empty@35 // through LazyPackageFragmentScopeForJavaPackage@34
+    functions('lang': Name@36) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@34
+    memberIndex = computeMemberIndex$1@38 // through LazyPackageFragmentScopeForJavaPackage@34
 }
 
-LazyJavaPackageFragment@12['lang'] {
-    classes('plus': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('plus': Name@33) = EmptyList@35[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@42 // through LazyPackageFragmentScopeForJavaPackage@41
+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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
index 37cf94f8fee..e498ca60117 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/abstractClass.lazy.log
@@ -23,3 +23,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <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 ef06fe17aa6..39ff87252db 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/anonymousObjectExtendsTraitWithRequired.lazy.log
@@ -34,3 +34,8 @@ LazyJavaPackageFragment@14['java'] {
     functions('lang': Name@27) = EmptyList@28[empty] // through LazyPackageFragmentScopeForJavaPackage@25
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@25
 }
+
+ResolutionTaskHolder@30 {
+    <name not found> = ArrayList@31[1] { ResolutionCandidate@32 }
+    <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 f9f503bd145..c486f9f87f4 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/differentGenericArguments.lazy.log
@@ -35,3 +35,8 @@ LazyJavaPackageFragment@11['java'] {
     functions('lang': Name@33) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@31
     memberIndex = computeMemberIndex$1@35 // through LazyPackageFragmentScopeForJavaPackage@31
 }
+
+ResolutionTaskHolder@36 {
+    <name not found> = ArrayList@37[1] { ResolutionCandidate@38 }
+    <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 4540e6ceb3c..9be96ecb2b3 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/kt3006.lazy.log
@@ -39,3 +39,29 @@ LazyJavaPackageFragment@12['lang'] {
     functions('f1': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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]
+    <name not found> = EmptyList@23[empty]
+    <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 }
+}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
index d06286febac..f82ecd6f811 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/manyTraitsRequireSameClass.lazy.log
@@ -32,3 +32,13 @@ LazyJavaPackageFragment@13['java'] {
     functions('lang': Name@32) = EmptyList@33[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@34 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
index a5fecd6e4fd..bd75fee4455 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/requirementFulfilledBySubclass.lazy.log
@@ -24,3 +24,13 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log b/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
index f60b71b14b5..2c1a71c1037 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/traitExtendsTraitWithRequired.lazy.log
@@ -31,3 +31,8 @@ LazyJavaPackageFragment@10['java'] {
     functions('lang': Name@29) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+ResolutionTaskHolder@32 {
+    <name not found> = ArrayList@33[1] { ResolutionCandidate@34 }
+    <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 d901d57a1fd..1311518149b 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/traitRequiresAny.lazy.log
@@ -25,3 +25,8 @@ LazyJavaPackageFragment@8['java'] {
     functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
     memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
+
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <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 8b066dae732..3c6ecaac14a 100644
--- a/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
+++ b/compiler/testData/diagnostics/tests/traitWithRequired/traitSupertypeList.lazy.log
@@ -22,3 +22,13 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log b/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
index 992af6beb99..c38d5ca731d 100644
--- a/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/unit/nullableUnit.lazy.log
@@ -36,3 +36,12 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo': 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> = 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]
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
index c0a88546946..37185b7de86 100644
--- a/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/AmbiguousVararg.lazy.log
@@ -40,3 +40,12 @@ LazyJavaPackageFragment@10['lang'] {
     functions('foo': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
     memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log b/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
index 14a9bc2d5da..67c6a11817f 100644
--- a/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/MoreSpecificVarargsOfEqualLength.lazy.log
@@ -19,22 +19,31 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Any': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@20
     classes('String': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    classes('from': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@20
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@20
-    functions('from': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@20
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@20
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@27
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@27
-    functions('lang': Name@28) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@27
-    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@27
+    classes('lang': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@23
+    deserializedPackageScope = Empty@24 // through LazyPackageFragmentScopeForJavaPackage@23
+    functions('lang': Name@25) = EmptyList@26[empty] // through LazyPackageFragmentScopeForJavaPackage@23
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@23
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    classes('from': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@30
-    deserializedPackageScope = Empty@23 // through LazyPackageFragmentScopeForJavaPackage@30
-    functions('from': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
-    memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
+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@36 {
+    <name not found> = ArrayList@37[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+    <name not found> = ArrayList@40[2] { ResolutionCandidate@38, ResolutionCandidate@39 }
+}
+
+ResolutionTaskHolder@41 {
+    <name not found> = ArrayList@42[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
+    <name not found> = ArrayList@45[2] { ResolutionCandidate@43, ResolutionCandidate@44 }
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log b/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
index c27496a545e..5a9b5da4764 100644
--- a/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/MostSepcificVarargsWithJava.lazy.log
@@ -5,144 +5,202 @@ LazyJavaClassDescriptor@0['C'] {
     memberIndex = computeMemberIndex$1@9 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@10 // through LazyJavaClassMemberScope@3
     nestedClasses('from': Name@4) = null // through LazyJavaClassMemberScope@3
-    properties('from': Name@4) = EmptyList@11[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@13['C']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@11['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@12['C']
 }
 
-LazyJavaClassTypeConstructor@13['C'] {
-    parameters = ArrayList@14[empty]
-    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
+LazyJavaClassTypeConstructor@12['C'] {
+    parameters = ArrayList@13[empty]
+    supertypes = ArrayList@14[1] { JetTypeImpl@15['Any'] }
 }
 
-LazyJavaClassifierType@17['Object'] {
-    classifier = JavaClassImpl@18['Object']
-    typeConstructor = DeserializedClassTypeConstructor@19
+LazyJavaClassifierType@16['Object'] {
+    classifier = JavaClassImpl@17['Object']
+    typeConstructor = DeserializedClassTypeConstructor@18
 }
 
-LazyJavaClassifierType@20['String'] {
-    arguments = ArrayList@21[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@19['String'] {
+    arguments = ArrayList@20[empty]
+    classifier = JavaClassImpl@21['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@25['String'] {
-    arguments = ArrayList@26[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@24['String'] {
+    arguments = ArrayList@25[empty]
+    classifier = JavaClassImpl@26['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@28['String'] {
-    arguments = ArrayList@29[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@27['String'] {
+    arguments = ArrayList@28[empty]
+    classifier = JavaClassImpl@29['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@31['String'] {
-    arguments = ArrayList@32[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@30['String'] {
+    arguments = ArrayList@31[empty]
+    classifier = JavaClassImpl@32['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@34['String'] {
-    arguments = ArrayList@35[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@33['String'] {
+    arguments = ArrayList@34[empty]
+    classifier = JavaClassImpl@35['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@37['String'] {
-    arguments = ArrayList@38[empty]
-    classifier = JavaClassImpl@39['String']
-    nullable = 'false': Boolean@23
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@36['String'] {
+    arguments = ArrayList@37[empty]
+    classifier = JavaClassImpl@38['String']
+    nullable = 'false': Boolean@22
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@40['String'] {
-    arguments = ArrayList@41[empty]
-    classifier = JavaClassImpl@36['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@39['String'] {
+    arguments = ArrayList@40[empty]
+    classifier = JavaClassImpl@38['String']
+    nullable = 'true': Boolean@41
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@43['String'] {
-    arguments = ArrayList@44[empty]
-    classifier = JavaClassImpl@33['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@42['String'] {
+    arguments = ArrayList@43[empty]
+    classifier = JavaClassImpl@35['String']
+    nullable = 'true': Boolean@41
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@45['String'] {
-    arguments = ArrayList@46[empty]
-    classifier = JavaClassImpl@27['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@44['String'] {
+    arguments = ArrayList@45[empty]
+    classifier = JavaClassImpl@21['String']
+    nullable = 'true': Boolean@41
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@47['String'] {
-    arguments = ArrayList@48[empty]
-    classifier = JavaClassImpl@22['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@46['String'] {
+    arguments = ArrayList@47[empty]
+    classifier = JavaClassImpl@32['String']
+    nullable = 'true': Boolean@41
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@49['String'] {
-    arguments = ArrayList@50[empty]
-    classifier = JavaClassImpl@39['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@48['String'] {
+    arguments = ArrayList@49[empty]
+    classifier = JavaClassImpl@29['String']
+    nullable = 'true': Boolean@41
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaClassifierType@51['String'] {
-    arguments = ArrayList@52[empty]
-    classifier = JavaClassImpl@30['String']
-    nullable = 'true': Boolean@42
-    typeConstructor = DeserializedClassTypeConstructor@24
+LazyJavaClassifierType@50['String'] {
+    arguments = ArrayList@51[empty]
+    classifier = JavaClassImpl@26['String']
+    nullable = 'true': Boolean@41
+    typeConstructor = DeserializedClassTypeConstructor@23
 }
 
-LazyJavaPackageFragmentProvider@53 {
-    packageFragments('<root>': FqName@54) = LazyJavaPackageFragment@55['<root>']
-    packageFragments('Array': FqName@56) = null
-    packageFragments('C': FqName@57) = null
-    packageFragments('String': FqName@58) = null
-    packageFragments('java': FqName@59) = LazyJavaPackageFragment@60['java']
-    packageFragments('java.lang': FqName@61) = LazyJavaPackageFragment@62['lang']
-    packageFragments('java.lang.Array': FqName@63) = null
-    packageFragments('java.lang.C': FqName@64) = null
-    packageFragments('java.lang.String': FqName@65) = null
-    packageFragments('kotlin': FqName@66) = null
-    packageFragments('kotlin.Array': FqName@67) = null
-    packageFragments('kotlin.C': FqName@68) = null
-    packageFragments('kotlin.String': FqName@69) = null
-    packageFragments('kotlin.io': FqName@70) = null
-    packageFragments('kotlin.jvm': FqName@71) = null
-    topLevelClasses(JavaClassImpl@72['C']) = LazyJavaClassDescriptor@0['C']
+LazyJavaPackageFragmentProvider@52 {
+    packageFragments('<root>': FqName@53) = LazyJavaPackageFragment@54['<root>']
+    packageFragments('Array': FqName@55) = null
+    packageFragments('C': FqName@56) = null
+    packageFragments('String': FqName@57) = null
+    packageFragments('java': FqName@58) = LazyJavaPackageFragment@59['java']
+    packageFragments('java.lang': FqName@60) = LazyJavaPackageFragment@61['lang']
+    packageFragments('java.lang.Array': FqName@62) = null
+    packageFragments('java.lang.C': FqName@63) = null
+    packageFragments('java.lang.String': FqName@64) = null
+    packageFragments('kotlin': FqName@65) = null
+    packageFragments('kotlin.Array': FqName@66) = null
+    packageFragments('kotlin.C': FqName@67) = null
+    packageFragments('kotlin.String': FqName@68) = null
+    packageFragments('kotlin.io': FqName@69) = null
+    packageFragments('kotlin.jvm': FqName@70) = null
+    topLevelClasses(JavaClassImpl@71['C']) = LazyJavaClassDescriptor@0['C']
 }
 
-LazyJavaPackageFragment@55['<root>'] {
-    classes('Array': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('C': Name@75) = LazyJavaClassDescriptor@0['C'] // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('String': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    classes('from': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@74
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@74
-    functions('from': Name@4) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@74
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@74
+LazyJavaPackageFragment@54['<root>'] {
+    classes('Array': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('C': Name@74) = LazyJavaClassDescriptor@0['C'] // through LazyPackageFragmentScopeForJavaPackage@73
+    classes('String': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-LazyJavaPackageFragment@60['java'] {
-    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('lang': Name@81) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+LazyJavaPackageFragment@59['java'] {
+    classes('lang': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('lang': Name@79) = EmptyList@80[empty] // through LazyPackageFragmentScopeForJavaPackage@77
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-LazyJavaPackageFragment@62['lang'] {
-    classes('from': Name@4) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@77 // through LazyPackageFragmentScopeForJavaPackage@83
-    functions('from': Name@4) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
+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 }
+}
+
+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> = ArrayList@111[1] { ResolutionCandidate@112 }
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@112 }
+}
+
+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@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@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@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, ... }
 }
diff --git a/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log b/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
index c9c9d313b0a..adec51bcf4d 100644
--- a/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/NilaryVsVararg.lazy.log
@@ -39,3 +39,44 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo0': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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@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]
+    <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]
+    <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 }
+    <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 19f6be42b90..02e057dd514 100644
--- a/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/UnaryVsVararg.lazy.log
@@ -39,3 +39,35 @@ LazyJavaPackageFragment@8['lang'] {
     functions('foo1': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
     memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
 }
+
+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@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]
+    <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]
+    <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 7888a423aed..6b20de8b446 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1781.lazy.log
@@ -53,3 +53,21 @@ LazyJavaPackageFragment@22['lang'] {
     functions('JavaClass': Name@27) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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 }
+    <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/kt1835.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
index dc87d3f7a0a..ee71e786626 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1835.lazy.log
@@ -7,88 +7,125 @@ LazyJavaClassDescriptor@0['JavaClass'] {
     memberIndex = computeMemberIndex$1@10 // through LazyJavaClassMemberScope@3
     nestedClassIndex = LinkedHashMap@11 // through LazyJavaClassMemberScope@3
     nestedClasses('from': Name@6) = null // through LazyJavaClassMemberScope@3
-    properties('from': Name@6) = EmptyList@12[empty] // through LazyJavaClassMemberScope@3
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@13['<this>']
-    typeConstructor = LazyJavaClassTypeConstructor@14['JavaClass']
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@12['<this>']
+    typeConstructor = LazyJavaClassTypeConstructor@13['JavaClass']
 }
 
-LazyJavaClassTypeConstructor@14['JavaClass'] {
-    parameters = ArrayList@15[empty]
-    supertypes = ArrayList@16[1] { JetTypeImpl@17['Any'] }
+LazyJavaClassTypeConstructor@13['JavaClass'] {
+    parameters = ArrayList@14[empty]
+    supertypes = ArrayList@15[1] { JetTypeImpl@16['Any'] }
 }
 
-LazyJavaClassifierType@18['Object'] {
-    classifier = JavaClassImpl@19['Object']
-    typeConstructor = DeserializedClassTypeConstructor@20
+LazyJavaClassifierType@17['Object'] {
+    classifier = JavaClassImpl@18['Object']
+    typeConstructor = DeserializedClassTypeConstructor@19
 }
 
-LazyJavaClassifierType@21['String'] {
-    arguments = ArrayList@22[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@20['String'] {
+    arguments = ArrayList@21[empty]
+    classifier = JavaClassImpl@22['String']
+    nullable = 'false': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaClassifierType@26['String'] {
-    arguments = ArrayList@27[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'false': Boolean@24
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@25['String'] {
+    arguments = ArrayList@26[empty]
+    classifier = JavaClassImpl@27['String']
+    nullable = 'false': Boolean@23
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaClassifierType@29['String'] {
-    arguments = ArrayList@30[empty]
-    classifier = JavaClassImpl@28['String']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@28['String'] {
+    arguments = ArrayList@29[empty]
+    classifier = JavaClassImpl@27['String']
+    nullable = 'true': Boolean@30
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaClassifierType@32['String'] {
-    arguments = ArrayList@33[empty]
-    classifier = JavaClassImpl@23['String']
-    nullable = 'true': Boolean@31
-    typeConstructor = DeserializedClassTypeConstructor@25
+LazyJavaClassifierType@31['String'] {
+    arguments = ArrayList@32[empty]
+    classifier = JavaClassImpl@22['String']
+    nullable = 'true': Boolean@30
+    typeConstructor = DeserializedClassTypeConstructor@24
 }
 
-LazyJavaPackageFragmentProvider@34 {
-    packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
-    packageFragments('Array': FqName@37) = null
-    packageFragments('String': FqName@38) = null
-    packageFragments('java': FqName@39) = LazyJavaPackageFragment@40['java']
-    packageFragments('java.lang': FqName@41) = LazyJavaPackageFragment@42['lang']
-    packageFragments('java.lang.Array': FqName@43) = null
-    packageFragments('java.lang.String': FqName@44) = null
-    packageFragments('kotlin': FqName@45) = null
-    packageFragments('kotlin.Array': FqName@46) = null
-    packageFragments('kotlin.String': FqName@47) = null
-    packageFragments('kotlin.io': FqName@48) = null
-    packageFragments('kotlin.jvm': FqName@49) = null
-    topLevelClasses(JavaClassImpl@50['JavaClass']) = LazyJavaClassDescriptor@0['JavaClass']
+LazyJavaPackageFragmentProvider@33 {
+    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
+    packageFragments('Array': FqName@36) = null
+    packageFragments('String': FqName@37) = null
+    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
+    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
+    packageFragments('java.lang.Array': FqName@42) = null
+    packageFragments('java.lang.String': FqName@43) = null
+    packageFragments('kotlin': FqName@44) = null
+    packageFragments('kotlin.Array': FqName@45) = null
+    packageFragments('kotlin.String': FqName@46) = null
+    packageFragments('kotlin.io': FqName@47) = null
+    packageFragments('kotlin.jvm': FqName@48) = null
+    topLevelClasses(JavaClassImpl@49['JavaClass']) = LazyJavaClassDescriptor@0['JavaClass']
 }
 
-LazyJavaPackageFragment@36['<root>'] {
-    classes('Array': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('JavaClass': Name@53) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('String': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('from': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('JavaClass': Name@53) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('from': Name@6) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@52
+LazyJavaPackageFragment@35['<root>'] {
+    classes('Array': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('JavaClass': Name@52) = LazyJavaClassDescriptor@0['JavaClass'] // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('String': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('JavaClass': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
-LazyJavaPackageFragment@40['java'] {
+LazyJavaPackageFragment@39['java'] {
     classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@58
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@58
+    functions('lang': Name@59) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@58
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
 }
 
-LazyJavaPackageFragment@42['lang'] {
-    classes('JavaClass': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('from': Name@6) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('JavaClass': Name@53) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('from': Name@6) = EmptyList@12[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+LazyJavaPackageFragment@41['lang'] {
+    classes('JavaClass': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('JavaClass': Name@52) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@61
     memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
 }
+
+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]
+    <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]
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
index 59529e6177f..b7388a66136 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1838-param.lazy.log
@@ -17,16 +17,16 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@18
     classes('IntArray': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@18
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@18
 }
 
 LazyJavaPackageFragment@7['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
-LazyJavaPackageFragment@9['lang'] {
-    deserializedPackageScope = Empty@20 // through LazyPackageFragmentScopeForJavaPackage@26
+ResolutionTaskHolder@26 {
+    <name not found> = ArrayList@27[1] { ResolutionCandidate@28 }
+    <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 96023f14b74..c5e482d63e8 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt1838-val.lazy.log
@@ -32,3 +32,10 @@ LazyJavaPackageFragment@9['lang'] {
     classes('t': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@27
     deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log b/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
index 0fcbbbecd39..d0a40f646c3 100644
--- a/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/kt422.lazy.log
@@ -50,3 +50,55 @@ LazyJavaPackageFragment@14['lang'] {
     functions('foo': Name@28) = EmptyList@30[empty] // through LazyPackageFragmentScopeForJavaPackage@36
     memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@36
 }
+
+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@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@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]
+    <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]
+    <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 }
+    <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 d89231d04ed..7bcba7a6a23 100644
--- a/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
+++ b/compiler/testData/diagnostics/tests/varargs/varargsAndFunctionLiterals.lazy.log
@@ -35,3 +35,39 @@ LazyJavaPackageFragment@8['lang'] {
     functions('f': Name@19) = EmptyList@21[empty] // through LazyPackageFragmentScopeForJavaPackage@27
     memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@27
 }
+
+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]
+    <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]
+    <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]
+}
diff --git a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
index 4ba431fddb6..b4ecd24c116 100644
--- a/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/AnnotatedWhenStatement.lazy.log
@@ -28,3 +28,13 @@ LazyJavaPackageFragment@9['java'] {
     functions('lang': Name@24) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@22
     memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@22
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
index 551d8f715e9..b4f27e9df2d 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnum.lazy.log
@@ -82,3 +82,209 @@ LazyJavaPackageFragment@38['lang'] {
     functions('nullableNothing': Name@52) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@59
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@59
 }
+
+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]
+    <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 }
+    <name not found> = EmptyList@11[empty]
+    <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]
+    <name not found> = EmptyList@11[empty]
+}
+
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
+    <name not found> = EmptyList@11[empty]
+    <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]
+    <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@97 {
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@99 }
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@99 }
+    <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]
+    <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]
+    <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@115 {
+    <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@116 {
+    <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@117 {
+    <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@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 {
+    <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 906ad6d428c..3e131014c49 100644
--- a/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/ElseOnNullableEnumWithSmartCast.lazy.log
@@ -38,3 +38,67 @@ LazyJavaPackageFragment@9['lang'] {
     functions('equals': Name@22) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@30
     memberIndex = computeMemberIndex$1@31 // through LazyPackageFragmentScopeForJavaPackage@30
 }
+
+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]
+}
+
+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@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@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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 eb6d8ce2897..779e59d7b1a 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseExpectedUnit.lazy.log
@@ -24,3 +24,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
index 576bf9b7341..cdc81c7c937 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseNoExpectedType.lazy.log
@@ -24,3 +24,13 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
index 048aab64f04..3fc5f32450c 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedCoercionToUnit.lazy.log
@@ -17,29 +17,51 @@ LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('Unit': Name@18) = null // through LazyPackageFragmentScopeForJavaPackage@17
     classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    classes('r': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@17
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    functions('r': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@17
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@17
+    classes('r': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@17
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('f': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    functions('r': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@17
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@17
 }
 
 LazyJavaPackageFragment@6['java'] {
-    classes('lang': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@26
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@26
-    functions('lang': Name@27) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@26
-    memberIndex = computeMemberIndex$1@28 // through LazyPackageFragmentScopeForJavaPackage@26
+    classes('lang': Name@24) = null // through LazyPackageFragmentScopeForJavaPackage@25
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@25
+    functions('lang': Name@26) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@25
+    memberIndex = computeMemberIndex$1@27 // through LazyPackageFragmentScopeForJavaPackage@25
 }
 
 LazyJavaPackageFragment@8['lang'] {
-    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('invoke': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    classes('r': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@29
-    deserializedPackageScope = Empty@22 // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('f': Name@19) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('invoke': Name@20) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    functions('r': Name@21) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@29
-    memberIndex = computeMemberIndex$1@30 // through LazyPackageFragmentScopeForJavaPackage@29
+    classes('f': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('r': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@21 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('f': Name@19) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('r': Name@20) = EmptyList@22[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@29 // through LazyPackageFragmentScopeForJavaPackage@28
+}
+
+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@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/when/NoElseReturnedFromLambdaExpectedInt.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
index aa05f35af4c..5df317b4f61 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedFromLambdaExpectedInt.lazy.log
@@ -13,29 +13,51 @@ LazyJavaPackageFragmentProvider@0 {
 LazyJavaPackageFragment@2['<root>'] {
     classes('Int': Name@13) = null // through LazyPackageFragmentScopeForJavaPackage@14
     classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    classes('r': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@14
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('f': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('invoke': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    functions('r': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@14
-    memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@14
+    classes('r': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@14
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('f': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    functions('r': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@14
+    memberIndex = computeMemberIndex$1@19 // through LazyPackageFragmentScopeForJavaPackage@14
 }
 
 LazyJavaPackageFragment@5['java'] {
-    classes('lang': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@22
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@22
-    functions('lang': Name@23) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@22
-    memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@22
+    classes('lang': Name@20) = null // through LazyPackageFragmentScopeForJavaPackage@21
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@21
+    functions('lang': Name@22) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@21
+    memberIndex = computeMemberIndex$1@23 // through LazyPackageFragmentScopeForJavaPackage@21
 }
 
 LazyJavaPackageFragment@7['lang'] {
-    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('invoke': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    classes('r': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@25
-    deserializedPackageScope = Empty@18 // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('f': Name@15) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('invoke': Name@16) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    functions('r': Name@17) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@25
-    memberIndex = computeMemberIndex$1@26 // through LazyPackageFragmentScopeForJavaPackage@25
+    classes('f': Name@15) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    classes('r': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@24
+    deserializedPackageScope = Empty@17 // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('f': Name@15) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    functions('r': Name@16) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@24
+    memberIndex = computeMemberIndex$1@25 // through LazyPackageFragmentScopeForJavaPackage@24
+}
+
+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]
+    <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@38 {
+    <name not found> = ArrayList@39[1] { ResolutionCandidate@40 }
+    <name not found> = ArrayList@41[1] { ResolutionCandidate@40 }
 }
diff --git a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
index 576bf9b7341..0b4ded2ca54 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedNonUnit.lazy.log
@@ -24,3 +24,8 @@ LazyJavaPackageFragment@6['java'] {
     functions('lang': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@20
     memberIndex = computeMemberIndex$1@24 // through LazyPackageFragmentScopeForJavaPackage@20
 }
+
+ResolutionTaskHolder@25 {
+    <name not found> = ArrayList@26[1] { ResolutionCandidate@27 }
+    <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 ce0952c6d88..91f94fb77a7 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseReturnedUnit.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 ce0952c6d88..91f94fb77a7 100644
--- a/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/NoElseWhenStatement.lazy.log
@@ -20,3 +20,8 @@ LazyJavaPackageFragment@5['java'] {
     functions('lang': Name@18) = EmptyList@19[empty] // through LazyPackageFragmentScopeForJavaPackage@16
     memberIndex = computeMemberIndex$1@20 // through LazyPackageFragmentScopeForJavaPackage@16
 }
+
+ResolutionTaskHolder@21 {
+    <name not found> = ArrayList@22[1] { ResolutionCandidate@23 }
+    <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 0af642415b3..9a9c0b4782a 100644
--- a/compiler/testData/diagnostics/tests/when/When.lazy.log
+++ b/compiler/testData/diagnostics/tests/when/When.lazy.log
@@ -33,37 +33,202 @@ LazyJavaPackageFragment@3['<root>'] {
     classes('Int': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('String': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@28
     classes('a': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('contains': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('plus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    classes('rangeTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@28
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('a': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('contains': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('foo': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('plus': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    functions('rangeTo': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@28
-    memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@28
+    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@28
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('a': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    functions('foo': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@28
+    memberIndex = computeMemberIndex$1@37 // through LazyPackageFragmentScopeForJavaPackage@28
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@42
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@42
-    functions('lang': Name@43) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@42
-    memberIndex = computeMemberIndex$1@44 // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('lang': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('lang': Name@40) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@41 // through LazyPackageFragmentScopeForJavaPackage@39
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('a': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('contains': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('foo': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('plus': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    classes('rangeTo': Name@36) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@37 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('a': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('contains': Name@33) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('foo': Name@34) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('plus': Name@35) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('rangeTo': Name@36) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('a': Name@32) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    classes('foo': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@42
+    deserializedPackageScope = Empty@34 // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('a': Name@35) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    functions('foo': Name@33) = EmptyList@36[empty] // through LazyPackageFragmentScopeForJavaPackage@42
+    memberIndex = computeMemberIndex$1@43 // through LazyPackageFragmentScopeForJavaPackage@42
+}
+
+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@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 }
+}
+
+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[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[7] { ResolutionCandidate@86, ResolutionCandidate@87, ResolutionCandidate@88, ... }
+    <name not found> = ArrayList@89[7] { 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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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]
+}
+
+ResolutionTaskHolder@105 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@106 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@107 {
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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 94e6f199048..066990ec0f9 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@14
+    constructor = AbstractLazyTypeParameterDescriptor$1@18
 }
 
 DeserializedType@22['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@18
+    constructor = AbstractLazyTypeParameterDescriptor$1@14
 }
 
 DeserializedType@23['T in kotlin'] {
@@ -51,12 +51,12 @@ DeserializedType@27['java.lang.Class'] {
     memberScope = SubstitutingScope@28
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@20['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@29
     memberScope = DeserializedClassMemberScope@30
 }
 
-DeserializedType@20['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@29
     memberScope = DeserializedClassMemberScope@30
 }
@@ -293,12 +293,190 @@ LazyJavaTypeParameterResolver@164 {
     resolve(JavaTypeParameterImpl@165['T']) = LazyJavaTypeParameterDescriptor@63['T']
 }
 
-TypeDeserializer@166 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-    classDescriptors('54': Integer@169) = LazyJavaClassDescriptor@42['Class']
+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> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
 }
 
-TypeDeserializer@170 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@168['Any']
-    classDescriptors('54': Integer@169) = LazyJavaClassDescriptor@42['Class']
+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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <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@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]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+    <name not found> = EmptyList@38[empty]
+}
+
+TypeDeserializer@184 {
+    classDescriptors('34': Integer@185) = LazyJavaClassDescriptor@42['Class']
+    classDescriptors('9': Integer@186) = DeserializedClassDescriptor@187['Any']
+}
+
+TypeDeserializer@188 {
+    classDescriptors('34': Integer@185) = LazyJavaClassDescriptor@42['Class']
+    classDescriptors('9': Integer@186) = DeserializedClassDescriptor@187['Any']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
index c4b4ef2b9e6..d99fa1d9488 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.lazy.log
@@ -106,6 +106,26 @@ LazyJavaPackageFragment@3['platform'] {
     classes('platformName': Name@53) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@75
 }
 
-TypeDeserializer@76 {
-    classDescriptors('4': Integer@77) = DeserializedClassDescriptor@78['String']
+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 }
+}
+
+TypeDeserializer@92 {
+    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@94['String']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
index 0edacaad1d8..acd799a68b2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/platformName.lazy.log
@@ -219,6 +219,101 @@ LazyJavaPackageFragment@7['platform'] {
     classes('platformName': Name@129) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@151
 }
 
-TypeDeserializer@152 {
-    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@154['String']
+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[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[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 }
+}
+
+TypeDeserializer@228 {
+    classDescriptors('4': Integer@229) = DeserializedClassDescriptor@230['String']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
index 0bc4f31d229..b30de9455ad 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/array.lazy.log
@@ -40,19 +40,19 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }
 
 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@22
+    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }
 
 DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@31['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@33['java.lang.Class'] {
@@ -474,17 +474,312 @@ LazyJavaTypeParameterResolver@241 {
     resolve(JavaTypeParameterImpl@242['T']) = LazyJavaTypeParameterDescriptor@98['T']
 }
 
-TypeDeserializer@243 {
-    classDescriptors('2': Integer@244) = DeserializedClassDescriptor@245['Any']
-    classDescriptors('3': Integer@246) = DeserializedClassDescriptor@247['Array']
+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]
+    <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]
 }
 
-TypeDeserializer@248 {
-    classDescriptors('2': Integer@244) = DeserializedClassDescriptor@245['Any']
-    classDescriptors('54': Integer@249) = LazyJavaClassDescriptor@88['Class']
+ResolutionTaskHolder@247 {
+    <name not found> = ArrayList@248[1] { ResolutionCandidate@249 }
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@249 }
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
 }
 
-TypeDeserializer@250 {
-    classDescriptors('20': Integer@251) = DeserializedClassDescriptor@252['Int']
-    classDescriptors('45': Integer@253) = DeserializedClassDescriptor@254['IntArray']
+ResolutionTaskHolder@251 {
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@253 }
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@253 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@204[empty]
+    <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]
+    <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@323 {
+    <name not found> = ArrayList@324[1] { ResolutionCandidate@325 }
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@325 }
+    <name not found> = EmptyList@204[empty]
+    <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]
+    <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@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@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@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
+    <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 abdd2562c41..5e348a97192 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/classLiteral.lazy.log
@@ -170,7 +170,42 @@ LazyJavaTypeParameterResolver@104 {
     resolve(JavaTypeParameterImpl@105['T']) = LazyJavaTypeParameterDescriptor@33['T']
 }
 
-TypeDeserializer@106 {
-    classDescriptors('2': Integer@107) = DeserializedClassDescriptor@108['Any']
-    classDescriptors('54': Integer@109) = LazyJavaClassDescriptor@31['Class']
+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]
+    <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]
+    <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@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
+}
+
+TypeDeserializer@126 {
+    classDescriptors('34': Integer@127) = LazyJavaClassDescriptor@31['Class']
+    classDescriptors('9': Integer@128) = DeserializedClassDescriptor@129['Any']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
index 1ea1862780d..266e972eb18 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/simple.lazy.log
@@ -321,12 +321,139 @@ LazyJavaPackageFragment@85['lang'] {
     memberIndex = computeMemberIndex$1@169 // through LazyPackageFragmentScopeForJavaPackage@168
 }
 
-TypeDeserializer@170 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('3': Integer@173) = DeserializedClassDescriptor@174['Array']
+ResolutionTaskHolder@170 {
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@172 }
+    <name not found> = ArrayList@173[1] { ResolutionCandidate@172 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
 }
 
-TypeDeserializer@175 {
-    classDescriptors('20': Integer@176) = DeserializedClassDescriptor@177['Int']
-    classDescriptors('45': Integer@178) = DeserializedClassDescriptor@179['IntArray']
+ResolutionTaskHolder@174 {
+    <name not found> = ArrayList@175[1] { ResolutionCandidate@176 }
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@176 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@178 {
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@180 }
+    <name not found> = ArrayList@181[1] { ResolutionCandidate@180 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@182 {
+    <name not found> = ArrayList@183[1] { ResolutionCandidate@184 }
+    <name not found> = ArrayList@185[1] { ResolutionCandidate@184 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@186 {
+    <name not found> = ArrayList@187[1] { ResolutionCandidate@188 }
+    <name not found> = ArrayList@189[1] { ResolutionCandidate@188 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@190 {
+    <name not found> = ArrayList@191[1] { ResolutionCandidate@192 }
+    <name not found> = ArrayList@193[1] { ResolutionCandidate@192 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@194 {
+    <name not found> = ArrayList@195[1] { ResolutionCandidate@196 }
+    <name not found> = ArrayList@197[1] { ResolutionCandidate@196 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@198 {
+    <name not found> = ArrayList@199[1] { ResolutionCandidate@200 }
+    <name not found> = ArrayList@201[1] { ResolutionCandidate@200 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@202 {
+    <name not found> = ArrayList@203[1] { ResolutionCandidate@204 }
+    <name not found> = ArrayList@205[1] { ResolutionCandidate@204 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@206 {
+    <name not found> = ArrayList@207[1] { ResolutionCandidate@208 }
+    <name not found> = ArrayList@209[1] { ResolutionCandidate@208 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+ResolutionTaskHolder@210 {
+    <name not found> = ArrayList@211[1] { ResolutionCandidate@212 }
+    <name not found> = ArrayList@213[1] { ResolutionCandidate@212 }
+    <name not found> = EmptyList@139[empty]
+    <name not found> = EmptyList@139[empty]
+}
+
+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 }
+}
+
+ResolutionTaskHolder@242 {
+    <name not found> = ArrayList@243[1] { ResolutionCandidate@244 }
+    <name not found> = ArrayList@245[1] { ResolutionCandidate@244 }
+}
+
+TypeDeserializer@246 {
+    classDescriptors('27': Integer@247) = DeserializedClassDescriptor@248['Int']
+    classDescriptors('28': Integer@249) = DeserializedClassDescriptor@250['IntArray']
+}
+
+TypeDeserializer@251 {
+    classDescriptors('8': Integer@252) = DeserializedClassDescriptor@253['Array']
+    classDescriptors('9': Integer@254) = DeserializedClassDescriptor@255['Any']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
index 6453b23ebde..f44eb246668 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/annotationParameterMustBeConstant/vararg.lazy.log
@@ -44,7 +44,7 @@ DeserializedType@29['T in kotlin'] {
 }
 
 DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@31['T in kotlin'] {
@@ -52,7 +52,7 @@ DeserializedType@31['T in kotlin'] {
 }
 
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@33['java.lang.Class'] {
@@ -476,17 +476,298 @@ LazyJavaTypeParameterResolver@243 {
     resolve(JavaTypeParameterImpl@244['T']) = LazyJavaTypeParameterDescriptor@110['T']
 }
 
-TypeDeserializer@245 {
-    classDescriptors('2': Integer@246) = DeserializedClassDescriptor@247['Any']
-    classDescriptors('3': Integer@248) = DeserializedClassDescriptor@249['Array']
+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]
 }
 
-TypeDeserializer@250 {
-    classDescriptors('2': Integer@246) = DeserializedClassDescriptor@247['Any']
-    classDescriptors('54': Integer@251) = LazyJavaClassDescriptor@100['Class']
+ResolutionTaskHolder@249 {
+    <name not found> = ArrayList@250[1] { ResolutionCandidate@251 }
+    <name not found> = ArrayList@252[1] { ResolutionCandidate@251 }
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
 }
 
-TypeDeserializer@252 {
-    classDescriptors('20': Integer@253) = DeserializedClassDescriptor@254['Int']
-    classDescriptors('45': Integer@255) = DeserializedClassDescriptor@256['IntArray']
+ResolutionTaskHolder@253 {
+    <name not found> = ArrayList@254[1] { ResolutionCandidate@255 }
+    <name not found> = ArrayList@256[1] { ResolutionCandidate@255 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@204[empty]
+    <name not found> = EmptyList@204[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@204[empty]
+    <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]
+    <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@313 {
+    <name not found> = ArrayList@314[1] { ResolutionCandidate@315 }
+    <name not found> = ArrayList@316[1] { ResolutionCandidate@315 }
+    <name not found> = EmptyList@204[empty]
+    <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]
+    <name not found> = EmptyList@204[empty]
+}
+
+ResolutionTaskHolder@325 {
+    <name not found> = ArrayList@326[1] { ResolutionCandidate@327 }
+    <name not found> = ArrayList@328[1] { ResolutionCandidate@327 }
+    <name not found> = EmptyList@204[empty]
+    <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@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@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@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@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+    <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 df5840f5a42..79a1e170c3b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.lazy.log
@@ -112,3 +112,43 @@ LazyJavaPackageFragment@7['platform'] {
     functions('platformStatic': Name@78) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@77
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
+
+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> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
index f2d7313c78f..43dcc56a9ce 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.lazy.log
@@ -91,3 +91,8 @@ LazyJavaPackageFragment@3['platform'] {
     functions('platformStatic': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
+
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <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 e0a37da87fd..674b13c7dcc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.lazy.log
@@ -138,3 +138,54 @@ LazyJavaPackageFragment@8['platform'] {
     functions('platformStatic': Name@85) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@84
     memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
+
+ResolutionTaskHolder@87 {
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@89 }
+    <name not found> = ArrayList@90[1] { ResolutionCandidate@89 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[empty]
+}
+
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[1] { ResolutionCandidate@97 }
+    <name not found> = EmptyList@62[empty]
+    <name not found> = EmptyList@62[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[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[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/annotations/qualifiedCallValue.lazy.log
index 7e3e4fb7e75..a734f90ad4e 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@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@30['T in kotlin'] {
@@ -54,7 +54,7 @@ DeserializedType@31['T in kotlin'] {
 }
 
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }
 
 DeserializedType@33['java.lang.Class'] {
@@ -322,17 +322,461 @@ LazyJavaTypeParameterResolver@217 {
     resolve(JavaTypeParameterImpl@218['T']) = LazyJavaTypeParameterDescriptor@93['T']
 }
 
-TypeDeserializer@219 {
-    classDescriptors('1': Integer@220) = DeserializedClassDescriptor@4['deprecated']
-    classDescriptors('3': Integer@221) = DeserializedClassDescriptor@222['String']
+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]
 }
 
-TypeDeserializer@223 {
-    classDescriptors('2': Integer@224) = DeserializedClassDescriptor@225['Any']
-    classDescriptors('3': Integer@221) = DeserializedClassDescriptor@226['Array']
+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]
+    <name not found> = EmptyList@185[empty]
+    <name not found> = EmptyList@185[empty]
 }
 
-TypeDeserializer@227 {
-    classDescriptors('2': Integer@224) = DeserializedClassDescriptor@225['Any']
-    classDescriptors('54': Integer@228) = LazyJavaClassDescriptor@91['Class']
+ResolutionTaskHolder@227 {
+    <name not found> = ArrayList@228[1] { ResolutionCandidate@229 }
+    <name not found> = ArrayList@230[1] { ResolutionCandidate@229 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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@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@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[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]
+    <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]
+    <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@309 {
+    <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@310 {
+    <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@311 {
+    <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@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]
+}
+
+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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@315 {
+    <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@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 ff477eda36c..32d20845735 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/abstractClassConstructors.lazy.log
@@ -141,10 +141,87 @@ LazyJavaPackageFragment@6['reflect'] {
     classes('KFunction0': Name@60) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
-TypeDeserializer@62 {
-    classDescriptors('2': Integer@63) = DeserializedClassDescriptor@64['Any']
+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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@65 {
-    classDescriptors('4': Integer@66) = DeserializedClassDescriptor@2['Function0']
+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]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <name not found> = EmptyList@36[empty]
+    <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@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@76 {
+    classDescriptors('2': Integer@77) = DeserializedClassDescriptor@78['Any']
+}
+
+TypeDeserializer@79 {
+    classDescriptors('4': Integer@80) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
index d6c545319c7..35a5ea73a31 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/ambiguityTopLevelVsTopLevel.lazy.log
@@ -102,3 +102,31 @@ LazyJavaPackageFragment@16['lang'] {
     functions('foo': Name@38) = EmptyList@40[empty] // through LazyPackageFragmentScopeForJavaPackage@60
     memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@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@40[empty]
+    <name not found> = EmptyList@40[empty]
+    <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 }
+    <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/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
index 800bd04f591..5c740404d01 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/callableRefrenceOnNestedObject.lazy.log
@@ -91,77 +91,170 @@ LazyJavaPackageFragmentProvider@43 {
 }
 
 LazyJavaPackageFragment@45['<root>'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@62
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@62
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@62
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@55['io'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@67 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@67
-    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
-    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@67
+    deserializedPackageScope = DeserializedPackageMemberScope@63 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@65 // through DeserializedPackageMemberScope@63
+    properties('A': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@63
 }
 
 LazyJavaPackageFragment@48['java'] {
-    classes('lang': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('lang': Name@73) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('lang': Name@70) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
 LazyJavaPackageFragment@58['jvm'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@75
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@72
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('ExtensionFunction0': Name@79) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('io': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('jvm': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = DeserializedPackageMemberScope@82 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('io': Name@83) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    functions('jvm': Name@84) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@78
-    membersProtos = LinkedHashMap@86 // through DeserializedPackageMemberScope@82
-    properties('A': Name@70) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('foo': Name@61) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('io': Name@83) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
-    properties('jvm': Name@84) = EmptyList@64[empty] // through DeserializedPackageMemberScope@82
+    classes('Any': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('ExtensionFunction0': Name@75) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = DeserializedPackageMemberScope@78 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('io': Name@79) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    functions('io': Name@79) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('jvm': Name@80) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    functions('jvm': Name@80) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@74
+    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@78
+    properties('A': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    properties('io': Name@79) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
+    properties('jvm': Name@80) = EmptyList@67[empty] // through DeserializedPackageMemberScope@78
 }
 
 LazyJavaPackageFragment@50['lang'] {
-    classes('foo': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@63 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('foo': Name@61) = EmptyList@64[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@61 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    classes('KMemberFunction0': Name@89) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-NestedClassDescriptors@91 {
+NestedClassDescriptors@86 {
     findNestedClass('invoke': Name@9) = null
 }
 
-TypeDeserializer@92 {
-    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
+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> = EmptyList@67[empty]
 }
 
-TypeDeserializer@95 {
-    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@94 {
+    <name not found> = ArrayList@95[1] { ResolutionCandidate@96 }
+    <name not found> = ArrayList@97[1] { ResolutionCandidate@96 }
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[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> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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@111 {
+    classDescriptors('2': Integer@112) = DeserializedClassDescriptor@113['Any']
+}
+
+TypeDeserializer@114 {
+    classDescriptors('4': Integer@115) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
index fa682cb53ab..91cbadcd918 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromClass.lazy.log
@@ -69,67 +69,117 @@ LazyJavaPackageFragment@32['io'] {
     memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
     membersProtos = LinkedHashMap@52 // through DeserializedPackageMemberScope@50
     properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
-    properties('x': Name@53) = EmptyList@46[empty] // through DeserializedPackageMemberScope@50
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('lang': Name@56) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('lang': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@54
+    functions('lang': Name@55) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@54
+    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
 LazyJavaPackageFragment@36['jvm'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Any': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('Function0': Name@62) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('io': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('jvm': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('reflect': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('io': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('jvm': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    functions('reflect': Name@69) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = LinkedHashMap@71 // through DeserializedPackageMemberScope@66
-    properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('io': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('jvm': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('reflect': Name@69) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
-    properties('x': Name@53) = EmptyList@46[empty] // through DeserializedPackageMemberScope@66
+    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('Any': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('Function0': Name@61) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('io': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('jvm': Name@63) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('reflect': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = DeserializedPackageMemberScope@65 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('io': Name@66) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('jvm': Name@67) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    functions('reflect': Name@68) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@59
+    membersProtos = LinkedHashMap@70 // through DeserializedPackageMemberScope@65
+    properties('A': Name@41) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    properties('io': Name@66) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    properties('jvm': Name@67) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
+    properties('reflect': Name@68) = EmptyList@46[empty] // through DeserializedPackageMemberScope@65
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('A': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@71
+    functions('A': Name@41) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@71
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@71
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@74) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('KFunction0': Name@76) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('KFunction0': Name@73) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@74
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@74
+    functions('KFunction0': Name@75) = EmptyList@46[empty] // through LazyPackageFragmentScopeForJavaPackage@74
+    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@74
 }
 
-TypeDeserializer@78 {
-    classDescriptors('2': Integer@79) = DeserializedClassDescriptor@80['Any']
+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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
 }
 
-TypeDeserializer@81 {
-    classDescriptors('3': Integer@82) = DeserializedClassDescriptor@80['Any']
-    classDescriptors('4': Integer@83) = DeserializedClassDescriptor@2['Function0']
+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]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <name not found> = EmptyList@46[empty]
+    <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@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 }
+}
+
+TypeDeserializer@93 {
+    classDescriptors('2': Integer@94) = DeserializedClassDescriptor@95['Any']
+}
+
+TypeDeserializer@96 {
+    classDescriptors('3': Integer@97) = DeserializedClassDescriptor@95['Any']
+    classDescriptors('4': Integer@98) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
index 5fe376a14a1..90241f6080e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtension.lazy.log
@@ -79,77 +79,125 @@ LazyJavaPackageFragment@34['io'] {
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@68) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('io': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@80) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('KFunction0': Name@82) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+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]
 }
 
-TypeDeserializer@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+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]
+}
+
+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 }
+}
+
+TypeDeserializer@98 {
+    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
index 5fe376a14a1..2145cde53ed 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromExtensionInClass.lazy.log
@@ -79,77 +79,257 @@ LazyJavaPackageFragment@34['io'] {
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
     properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Any': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@68) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('io': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('B': Name@47) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('B': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('B': Name@47) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@80) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('KFunction0': Name@82) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 }
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@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 }
+}
+
+TypeDeserializer@114 {
+    classDescriptors('2': Integer@115) = DeserializedClassDescriptor@116['Any']
+}
+
+TypeDeserializer@117 {
+    classDescriptors('3': Integer@118) = DeserializedClassDescriptor@116['Any']
+    classDescriptors('4': Integer@119) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
index b8d4d6dc018..52d18a85158 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/constructorFromTopLevel.lazy.log
@@ -122,11 +122,25 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-TypeDeserializer@76 {
-    classDescriptors('2': Integer@77) = DeserializedClassDescriptor@78['Any']
+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]
 }
 
-TypeDeserializer@79 {
-    classDescriptors('3': Integer@80) = DeserializedClassDescriptor@78['Any']
-    classDescriptors('4': Integer@81) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+TypeDeserializer@84 {
+    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+}
+
+TypeDeserializer@87 {
+    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
+    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
index a560294a36e..a8a1fe57d06 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageClass.lazy.log
@@ -58,7 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,7 +73,7 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,11 +83,6 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -164,130 +164,325 @@ LazyJavaPackageFragment@74['io'] {
     classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
     classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@105
     classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = DeserializedPackageMemberScope@112 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@105
-    membersProtos = LinkedHashMap@115 // through DeserializedPackageMemberScope@112
-    properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
-    properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@112
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
 LazyJavaPackageFragment@57['java'] {
-    classes('lang': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@117
-    functions('lang': Name@119) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('lang': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = Empty@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('lang': Name@112) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
 LazyJavaPackageFragment@82['jvm'] {
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@107) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('io': Name@131) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('io': Name@131) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('jvm': Name@132) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('jvm': Name@132) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('reflect': Name@133) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    functions('reflect': Name@133) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@124
-    membersProtos = LinkedHashMap@135 // through DeserializedPackageMemberScope@130
-    properties('bar': Name@108) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('baz': Name@109) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('foo': Name@111) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('io': Name@131) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('jvm': Name@132) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
-    properties('reflect': Name@133) = EmptyList@113[empty] // through DeserializedPackageMemberScope@130
+    classes('Any': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('ExtensionFunction0': Name@118) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('ExtensionFunction1': Name@119) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('Int': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('Unit': Name@107) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('io': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('jvm': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('reflect': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    deserializedPackageScope = DeserializedPackageMemberScope@123 // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('io': Name@124) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    functions('io': Name@124) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('jvm': Name@125) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    functions('jvm': Name@125) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('reflect': Name@126) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    functions('reflect': Name@126) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@117
+    membersProtos = LinkedHashMap@128 // through DeserializedPackageMemberScope@123
+    properties('io': Name@124) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    properties('jvm': Name@125) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
+    properties('reflect': Name@126) = EmptyList@113[empty] // through DeserializedPackageMemberScope@123
 }
 
 LazyJavaPackageFragment@59['lang'] {
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@129
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('KMemberFunction0': Name@140) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('KMemberFunction1': Name@141) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('bar': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('baz': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('first': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('foo': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('bar': Name@108) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('baz': Name@109) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('foo': Name@111) = EmptyList@113[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('Int': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('KMemberFunction0': Name@132) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('KMemberFunction1': Name@133) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('String': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('Unit': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('first': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@144) = DeserializedClassDescriptor@145['Any']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@146 {
-    classDescriptors('2': Integer@144) = DeserializedClassDescriptor@145['Any']
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('2': Integer@144) = DeserializedClassDescriptor@145['Any']
+ResolutionTaskHolder@142 {
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@144 }
+    <name not found> = ArrayList@145[1] { ResolutionCandidate@144 }
 }
 
-TypeDeserializer@148 {
-    classDescriptors('3': Integer@149) = DeserializedClassDescriptor@145['Any']
-    classDescriptors('4': Integer@150) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@146 {
+    <name not found> = ArrayList@147[1] { ResolutionCandidate@148 }
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@148 }
 }
 
-TypeDeserializer@151 {
-    classDescriptors('3': Integer@149) = DeserializedClassDescriptor@145['Any']
-    classDescriptors('4': Integer@150) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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> = 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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+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]
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@169 {
+    <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@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 7f7b9ced5f0..b882437899a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageExtension.lazy.log
@@ -100,7 +100,6 @@ LazyJavaPackageFragment@44['io'] {
     membersProtos = LinkedHashMap@69 // through DeserializedPackageMemberScope@66
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
-    properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@66
 }
 
 LazyJavaPackageFragment@33['java'] {
@@ -151,7 +150,6 @@ LazyJavaPackageFragment@7['kotlin'] {
     membersProtos = LinkedHashMap@88 // through DeserializedPackageMemberScope@83
     properties('bar': Name@62) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('baz': Name@63) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
-    properties('foo': Name@65) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('io': Name@84) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('jvm': Name@85) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
     properties('reflect': Name@86) = EmptyList@67[empty] // through DeserializedPackageMemberScope@83
@@ -176,15 +174,347 @@ LazyJavaPackageFragment@8['reflect'] {
     memberIndex = computeMemberIndex$1@94 // through LazyPackageFragmentScopeForJavaPackage@92
 }
 
-TypeDeserializer@95 {
-    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
+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]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
 }
 
-TypeDeserializer@98 {
-    classDescriptors('2': Integer@96) = DeserializedClassDescriptor@97['Any']
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
 }
 
-TypeDeserializer@99 {
-    classDescriptors('3': Integer@100) = DeserializedClassDescriptor@97['Any']
-    classDescriptors('4': Integer@101) = DeserializedClassDescriptor@2['ExtensionFunction0']
+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]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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 {
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <name not found> = EmptyList@67[empty]
+    <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]
+}
+
+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@119 {
+    classDescriptors('2': Integer@120) = DeserializedClassDescriptor@121['Any']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
index a3192856279..40a63d2e72d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/differentPackageTopLevel.lazy.log
@@ -237,24 +237,66 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@128 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
+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]
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
+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]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
 }
 
-TypeDeserializer@132 {
-    classDescriptors('2': Integer@129) = DeserializedClassDescriptor@130['Any']
+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]
+    <name not found> = EmptyList@98[empty]
+    <name not found> = EmptyList@98[empty]
 }
 
-TypeDeserializer@133 {
-    classDescriptors('3': Integer@134) = DeserializedClassDescriptor@130['Any']
-    classDescriptors('4': Integer@135) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@134) = DeserializedClassDescriptor@130['Any']
-    classDescriptors('4': Integer@135) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
index 45864a81214..74f04fcd509 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromClass.lazy.log
@@ -63,6 +63,11 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
 DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
@@ -78,11 +83,6 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -186,116 +186,170 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction0': Name@136) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction1': Name@137) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction0': Name@133) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction1': Name@134) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
+    <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@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
+    <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@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
index c9fbc50bf85..6d9bd991291 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtension.lazy.log
@@ -58,7 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +78,7 @@ DeserializedType@30['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -186,116 +186,170 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction0': Name@136) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KExtensionFunction1': Name@137) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction0': Name@133) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KExtensionFunction1': Name@134) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
+    <name not found> = EmptyList@104[empty]
+    <name not found> = EmptyList@104[empty]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
+    <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@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
+    <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@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
index 2a9e7dd36da..0c218714dab 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromExtensionInClass.lazy.log
@@ -58,17 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@18['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +68,17 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@22['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -192,116 +192,224 @@ LazyJavaPackageFragment@74['io'] {
     properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
     properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
     properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('x': Name@117) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('y': Name@118) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
-    properties('z': Name@119) = EmptyList@110[empty] // through DeserializedPackageMemberScope@114
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('lang': Name@122) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('lang': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('lang': Name@119) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
 LazyJavaPackageFragment@83['jvm'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('ExtensionFunction0': Name@128) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('ExtensionFunction1': Name@129) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@104) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('io': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('jvm': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('reflect': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = DeserializedPackageMemberScope@133 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('io': Name@134) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('io': Name@134) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('jvm': Name@135) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('jvm': Name@135) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('reflect': Name@136) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    functions('reflect': Name@136) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@127
-    membersProtos = LinkedHashMap@138 // through DeserializedPackageMemberScope@133
-    properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('io': Name@134) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('jvm': Name@135) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('reflect': Name@136) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('x': Name@117) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('y': Name@118) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
-    properties('z': Name@119) = EmptyList@110[empty] // through DeserializedPackageMemberScope@133
+    classes('Any': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('ExtensionFunction0': Name@125) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('ExtensionFunction1': Name@126) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@104) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('io': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('jvm': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('reflect': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = DeserializedPackageMemberScope@130 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('io': Name@131) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('io': Name@131) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('jvm': Name@132) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('jvm': Name@132) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('reflect': Name@133) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    functions('reflect': Name@133) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@124
+    membersProtos = LinkedHashMap@135 // through DeserializedPackageMemberScope@130
+    properties('bar': Name@105) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('baz': Name@106) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('foo': Name@107) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('io': Name@131) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('jvm': Name@132) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
+    properties('reflect': Name@133) = EmptyList@110[empty] // through DeserializedPackageMemberScope@130
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('KExtensionFunction0': Name@142) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('KExtensionFunction1': Name@143) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@141
+    classes('Int': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('KExtensionFunction0': Name@139) = DeserializedClassDescriptor@6['KExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('KExtensionFunction1': Name@140) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('String': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Unit': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('bar': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('baz': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('foo': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    deserializedPackageScope = Empty@109 // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('bar': Name@105) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('baz': Name@106) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('foo': Name@107) = EmptyList@110[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@138
 }
 
-TypeDeserializer@145 {
-    classDescriptors('2': Integer@146) = DeserializedClassDescriptor@147['Any']
+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> = 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]
 }
 
-TypeDeserializer@148 {
-    classDescriptors('2': Integer@146) = DeserializedClassDescriptor@147['Any']
+ResolutionTaskHolder@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]
+    <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]
 }
 
-TypeDeserializer@149 {
-    classDescriptors('2': Integer@146) = DeserializedClassDescriptor@147['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@150 {
-    classDescriptors('3': Integer@151) = DeserializedClassDescriptor@147['Any']
-    classDescriptors('4': Integer@152) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@163 {
+    <name not found> = ArrayList@164[1] { ResolutionCandidate@165 }
+    <name not found> = ArrayList@166[1] { ResolutionCandidate@165 }
 }
 
-TypeDeserializer@153 {
-    classDescriptors('3': Integer@151) = DeserializedClassDescriptor@147['Any']
-    classDescriptors('4': Integer@152) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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 }
+}
+
+TypeDeserializer@175 {
+    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+}
+
+TypeDeserializer@178 {
+    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+}
+
+TypeDeserializer@179 {
+    classDescriptors('2': Integer@176) = DeserializedClassDescriptor@177['Any']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
index 22b93d271b3..884c012ac60 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionFromTopLevel.lazy.log
@@ -58,12 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,7 +73,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -183,9 +183,6 @@ LazyJavaPackageFragment@71['io'] {
     functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
     membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
@@ -237,9 +234,6 @@ LazyJavaPackageFragment@13['kotlin'] {
     functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
     membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
     properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
@@ -272,24 +266,282 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@136 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+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]
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+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]
 }
 
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+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]
 }
 
-TypeDeserializer@141 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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> = 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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+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]
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@171 {
+    <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@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 80888c97816..afa4c9a1d38 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionInClassDisallowed.lazy.log
@@ -52,57 +52,232 @@ LazyJavaPackageFragment@22['io'] {
     membersProtos = LinkedHashMap@42 // through DeserializedPackageMemberScope@40
     properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
     properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
-    properties('x': Name@43) = EmptyList@37[empty] // through DeserializedPackageMemberScope@40
 }
 
 LazyJavaPackageFragment@10['java'] {
-    classes('lang': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@45
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@45
-    functions('lang': Name@46) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@45
-    memberIndex = computeMemberIndex$1@47 // through LazyPackageFragmentScopeForJavaPackage@45
+    classes('lang': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@44
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@44
+    functions('lang': Name@45) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@44
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@44
 }
 
 LazyJavaPackageFragment@27['jvm'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@48
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@48
-    memberIndex = computeMemberIndex$1@49 // through LazyPackageFragmentScopeForJavaPackage@48
+    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@47
+    memberIndex = computeMemberIndex$1@48 // through LazyPackageFragmentScopeForJavaPackage@47
 }
 
 LazyJavaPackageFragment@17['kotlin'] {
-    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('io': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    classes('jvm': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@50
-    deserializedPackageScope = DeserializedPackageMemberScope@53 // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('io': Name@54) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    functions('jvm': Name@55) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    functions('jvm': Name@55) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@50
-    memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@50
-    membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@53
-    properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('io': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('jvm': Name@55) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
-    properties('x': Name@43) = EmptyList@37[empty] // through DeserializedPackageMemberScope@53
+    classes('Int': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('String': Name@33) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('io': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('jvm': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = DeserializedPackageMemberScope@52 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('io': Name@53) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('io': Name@53) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('jvm': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    functions('jvm': Name@54) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@49
+    memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@49
+    membersProtos = LinkedHashMap@56 // through DeserializedPackageMemberScope@52
+    properties('extA': Name@34) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    properties('extInt': Name@35) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    properties('io': Name@53) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
+    properties('jvm': Name@54) = EmptyList@37[empty] // through DeserializedPackageMemberScope@52
 }
 
 LazyJavaPackageFragment@12['lang'] {
-    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('extA': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('extInt': Name@35) = null // through LazyPackageFragmentScopeForJavaPackage@57
+    deserializedPackageScope = Empty@36 // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('extA': Name@34) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    functions('extInt': Name@35) = EmptyList@37[empty] // through LazyPackageFragmentScopeForJavaPackage@57
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@57
+}
+
+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]
+    <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@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> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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 {
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <name not found> = EmptyList@37[empty]
+    <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@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 be7610acd27..565aef54272 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/extensionOnNullable.lazy.log
@@ -140,7 +140,6 @@ LazyJavaPackageFragment@60['io'] {
     functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
     membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
 }
 
 LazyJavaPackageFragment@47['java'] {
@@ -177,7 +176,6 @@ LazyJavaPackageFragment@12['kotlin'] {
     functions('reflect': Name@105) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@97
     membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
     properties('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
@@ -200,20 +198,178 @@ LazyJavaPackageFragment@13['reflect'] {
     memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
-TypeDeserializer@112 {
-    classDescriptors('2': Integer@113) = DeserializedClassDescriptor@114['Any']
+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> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
 }
 
-TypeDeserializer@115 {
-    classDescriptors('2': Integer@113) = DeserializedClassDescriptor@114['Any']
+ResolutionTaskHolder@119 {
+    <name not found> = ArrayList@120[1] { ResolutionCandidate@121 }
+    <name not found> = ArrayList@122[1] { ResolutionCandidate@121 }
 }
 
-TypeDeserializer@116 {
-    classDescriptors('3': Integer@117) = DeserializedClassDescriptor@114['Any']
-    classDescriptors('4': Integer@118) = DeserializedClassDescriptor@2['ExtensionFunction0']
+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]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@119 {
-    classDescriptors('3': Integer@117) = DeserializedClassDescriptor@114['Any']
-    classDescriptors('4': Integer@118) = DeserializedClassDescriptor@2['ExtensionFunction0']
+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]
+    <name not found> = EmptyList@83[empty]
+    <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 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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@131 {
+    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+}
+
+TypeDeserializer@134 {
+    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+}
+
+TypeDeserializer@135 {
+    classDescriptors('3': Integer@136) = DeserializedClassDescriptor@133['Any']
+    classDescriptors('4': Integer@137) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@138 {
+    classDescriptors('3': Integer@136) = DeserializedClassDescriptor@133['Any']
+    classDescriptors('4': Integer@137) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/genericClassFromTopLevel.lazy.log
index 60671cda740..a0b9dae96d5 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@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
 }
@@ -74,91 +74,163 @@ LazyJavaPackageFragmentProvider@20 {
 LazyJavaPackageFragment@22['<root>'] {
     classes('KMemberFunction0': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
     classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('kotlin': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@55
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    functions('kotlin': Name@62) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@55
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('kotlin': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('kotlin': Name@60) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@55
 }
 
 LazyJavaPackageFragment@41['io'] {
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = DeserializedPackageMemberScope@65 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
-    membersProtos = LinkedHashMap@67 // through DeserializedPackageMemberScope@65
-    properties('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
-    properties('t': Name@59) = EmptyList@61[empty] // through DeserializedPackageMemberScope@65
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = DeserializedPackageMemberScope@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    membersProtos = LinkedHashMap@65 // through DeserializedPackageMemberScope@64
+    properties('t': Name@58) = EmptyList@61[empty] // through DeserializedPackageMemberScope@64
 }
 
 LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@69
-    functions('lang': Name@70) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@69
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('lang': Name@68) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
 }
 
 LazyJavaPackageFragment@47['jvm'] {
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@72
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@72
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@70
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@70
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('ExtensionFunction0': Name@76) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('io': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('jvm': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('reflect': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    deserializedPackageScope = DeserializedPackageMemberScope@80 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('io': Name@81) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('io': Name@81) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('jvm': Name@82) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('jvm': Name@82) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('reflect': Name@83) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    functions('reflect': Name@83) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@75
-    membersProtos = LinkedHashMap@85 // through DeserializedPackageMemberScope@80
-    properties('foo': Name@57) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('io': Name@81) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('jvm': Name@82) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('reflect': Name@83) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
-    properties('t': Name@59) = EmptyList@61[empty] // through DeserializedPackageMemberScope@80
+    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('ExtensionFunction0': Name@73) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('String': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('io': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('jvm': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('reflect': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    functions('io': Name@78) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    functions('jvm': Name@79) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    functions('reflect': Name@80) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@72
+    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@77
+    properties('io': Name@78) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    properties('jvm': Name@79) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    properties('reflect': Name@80) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
+    properties('t': Name@58) = EmptyList@61[empty] // through DeserializedPackageMemberScope@77
 }
 
 LazyJavaPackageFragment@30['lang'] {
-    classes('foo': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('t': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@57) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('t': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@88) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@89
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('KMemberFunction0': Name@90) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
+    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@59 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('KMemberFunction0': Name@86) = EmptyList@61[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
-TypeDeserializer@92 {
-    classDescriptors('2': Integer@93) = DeserializedClassDescriptor@94['Any']
+ResolutionTaskHolder@88 {
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@90 }
+    <name not found> = ArrayList@91[1] { ResolutionCandidate@90 }
+    <name not found> = EmptyList@61[empty]
+    <name not found> = EmptyList@61[empty]
 }
 
-TypeDeserializer@95 {
-    classDescriptors('3': Integer@96) = DeserializedClassDescriptor@94['Any']
-    classDescriptors('4': Integer@97) = DeserializedClassDescriptor@2['ExtensionFunction0']
+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@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@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@104 {
+    classDescriptors('2': Integer@105) = DeserializedClassDescriptor@106['Any']
+}
+
+TypeDeserializer@107 {
+    classDescriptors('3': Integer@108) = DeserializedClassDescriptor@106['Any']
+    classDescriptors('4': Integer@109) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
index 9c1628ce254..4f922d6b753 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/importedInnerConstructor.lazy.log
@@ -65,3 +65,39 @@ LazyJavaPackageFragment@7['lang'] {
     functions('Inner': Name@19) = EmptyList@18[empty] // through LazyPackageFragmentScopeForJavaPackage@39
     memberIndex = computeMemberIndex$1@40 // through LazyPackageFragmentScopeForJavaPackage@39
 }
+
+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]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 {
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <name not found> = EmptyList@18[empty]
+    <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 2c7e1d9bc52..5081f59c64c 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@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
 }
@@ -85,69 +85,544 @@ LazyJavaPackageFragment@39['io'] {
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
     membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
     properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
 }
 
 LazyJavaPackageFragment@28['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
 LazyJavaPackageFragment@44['jvm'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
+    classes('Any': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('ExtensionFunction0': Name@70) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('io': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('jvm': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('reflect': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
+    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@74
+    properties('Inner': Name@50) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
 }
 
 LazyJavaPackageFragment@30['lang'] {
-    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Inner': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Inner': Name@50) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('KMemberFunction0': Name@84) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+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> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+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]
+}
+
+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[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@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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 {
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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 85d30ec84ed..8ab6f0ea4af 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/innerConstructorFromExtension.lazy.log
@@ -86,71 +86,341 @@ LazyJavaPackageFragment@38['io'] {
     memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
     membersProtos = LinkedHashMap@61 // through DeserializedPackageMemberScope@59
     properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@59
 }
 
 LazyJavaPackageFragment@27['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@62) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@63
+    functions('lang': Name@64) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@63
+    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
 LazyJavaPackageFragment@43['jvm'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('x': Name@62) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
-    properties('y': Name@63) = EmptyList@55[empty] // through DeserializedPackageMemberScope@76
+    classes('Any': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('ExtensionFunction0': Name@70) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('io': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('jvm': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('reflect': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = DeserializedPackageMemberScope@74 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('io': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('jvm': Name@76) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    functions('reflect': Name@77) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@69
+    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@74
+    properties('Inner': Name@49) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('io': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('jvm': Name@76) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
+    properties('reflect': Name@77) = EmptyList@55[empty] // through DeserializedPackageMemberScope@74
 }
 
 LazyJavaPackageFragment@29['lang'] {
-    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Inner': Name@49) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('Inner': Name@49) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@80
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('KMemberFunction0': Name@84) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+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]
 }
 
-TypeDeserializer@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+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[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@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <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]
+    <name not found> = EmptyList@55[empty]
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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 62dd6bed8b2..8c529094780 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@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
 }
@@ -133,11 +133,129 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
-TypeDeserializer@80 {
-    classDescriptors('2': Integer@81) = DeserializedClassDescriptor@82['Any']
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
 }
 
-TypeDeserializer@83 {
-    classDescriptors('3': Integer@84) = DeserializedClassDescriptor@82['Any']
-    classDescriptors('4': Integer@85) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@84 {
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@86 }
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@86 }
+}
+
+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]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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 {
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <name not found> = EmptyList@49[empty]
+    <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]
+}
+
+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@94 {
+    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
+}
+
+TypeDeserializer@97 {
+    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
+    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
index 938585d3aaa..302ac8b8cd5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/javaStaticMethod.lazy.log
@@ -76,11 +76,11 @@ DeserializedType@28['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@41
 }
 
-DeserializedType@43['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
 }
 
-DeserializedType@24['kotlin.Any'] {
+DeserializedType@43['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@40
 }
 
@@ -171,12 +171,10 @@ LazyJavaPackageFragment@70['<root>'] {
     classes('KFunction1': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('kotlin': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@116
     classes('test': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@116
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     functions('kotlin': Name@125) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
     functions('test': Name@126) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@116
@@ -187,11 +185,8 @@ LazyJavaPackageFragment@92['io'] {
     classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@128
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@128
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@128
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@128
     deserializedPackageScope = DeserializedPackageMemberScope@129 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('invoke': Name@9) = EmptyList@57[empty] // through DeserializedPackageMemberScope@129
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@128
     functions('main2': Name@122) = EmptyList@57[empty] // through DeserializedPackageMemberScope@129
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@128
     memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
@@ -209,10 +204,8 @@ LazyJavaPackageFragment@99['jvm'] {
     classes('Array': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@136
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@136
     memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
 }
@@ -223,14 +216,11 @@ LazyJavaPackageFragment@7['kotlin'] {
     classes('Function1': Name@140) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@139
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('Unit': Name@120) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('io': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('jvm': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@139
     classes('reflect': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@139
     deserializedPackageScope = DeserializedPackageMemberScope@144 // through LazyPackageFragmentScopeForJavaPackage@139
-    functions('invoke': Name@9) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
     functions('io': Name@145) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
     functions('io': Name@145) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@139
     functions('jvm': Name@146) = EmptyList@57[empty] // through DeserializedPackageMemberScope@144
@@ -247,10 +237,8 @@ LazyJavaPackageFragment@7['kotlin'] {
 }
 
 LazyJavaPackageFragment@79['lang'] {
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@150
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@150
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@150
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@150
     memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@150
 }
@@ -260,10 +248,8 @@ LazyJavaPackageFragment@15['reflect'] {
     classes('KFunction1': Name@153) = DeserializedClassDescriptor@4['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@152
     classes('String': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@152
     classes('Unit': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@152
-    classes('invoke': Name@9) = null // through LazyPackageFragmentScopeForJavaPackage@152
     classes('main2': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@152
     deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@152
-    functions('invoke': Name@9) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@152
     functions('main2': Name@122) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@152
     memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@152
 }
@@ -279,15 +265,65 @@ NestedClassDescriptors@159 {
     findNestedClass('invoke': Name@9) = null
 }
 
-TypeDeserializer@160 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+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]
 }
 
-TypeDeserializer@163 {
-    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+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]
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
 }
 
-TypeDeserializer@164 {
-    classDescriptors('3': Integer@165) = DeserializedClassDescriptor@162['Any']
-    classDescriptors('4': Integer@166) = DeserializedClassDescriptor@2['Function1']
+ResolutionTaskHolder@168 {
+    <name not found> = ArrayList@169[1] { ResolutionCandidate@170 }
+    <name not found> = ArrayList@171[1] { ResolutionCandidate@170 }
+    <name not found> = EmptyList@57[empty]
+    <name not found> = EmptyList@57[empty]
+}
+
+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 }
+}
+
+TypeDeserializer@192 {
+    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@194['Any']
+}
+
+TypeDeserializer@195 {
+    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@194['Any']
+}
+
+TypeDeserializer@196 {
+    classDescriptors('3': Integer@197) = DeserializedClassDescriptor@194['Any']
+    classDescriptors('4': Integer@198) = DeserializedClassDescriptor@2['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
index b8d4d6dc018..52d18a85158 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructor.lazy.log
@@ -122,11 +122,25 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@73
 }
 
-TypeDeserializer@76 {
-    classDescriptors('2': Integer@77) = DeserializedClassDescriptor@78['Any']
+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]
 }
 
-TypeDeserializer@79 {
-    classDescriptors('3': Integer@80) = DeserializedClassDescriptor@78['Any']
-    classDescriptors('4': Integer@81) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@80 {
+    <name not found> = ArrayList@81[1] { ResolutionCandidate@82 }
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@82 }
+}
+
+TypeDeserializer@84 {
+    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+}
+
+TypeDeserializer@87 {
+    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
+    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
index 33187461511..a1ba029b13c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromExtensionInLocalClass.lazy.log
@@ -75,69 +75,159 @@ LazyJavaPackageFragment@34['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@67) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@79) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('KFunction0': Name@81) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@83 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@86 {
-    classDescriptors('3': Integer@87) = DeserializedClassDescriptor@85['Any']
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
+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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@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 }
+}
+
+TypeDeserializer@98 {
+    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
index 0415bfe6dfb..e4d3466cb6c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalClass.lazy.log
@@ -133,11 +133,39 @@ LazyJavaPackageFragment@8['reflect'] {
     memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
-TypeDeserializer@79 {
-    classDescriptors('2': Integer@80) = DeserializedClassDescriptor@81['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@82 {
-    classDescriptors('3': Integer@83) = DeserializedClassDescriptor@81['Any']
-    classDescriptors('4': Integer@84) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@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]
+}
+
+TypeDeserializer@87 {
+    classDescriptors('2': Integer@88) = DeserializedClassDescriptor@89['Any']
+}
+
+TypeDeserializer@90 {
+    classDescriptors('3': Integer@91) = DeserializedClassDescriptor@89['Any']
+    classDescriptors('4': Integer@92) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
index 33187461511..cfc9497cc58 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localConstructorFromLocalExtension.lazy.log
@@ -75,69 +75,119 @@ LazyJavaPackageFragment@34['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Function0': Name@67) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Int': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('A': Name@45) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('A': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('A': Name@45) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@79) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('KFunction0': Name@81) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@83 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+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]
 }
 
-TypeDeserializer@86 {
-    classDescriptors('3': Integer@87) = DeserializedClassDescriptor@85['Any']
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
+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]
+}
+
+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 }
+}
+
+TypeDeserializer@98 {
+    classDescriptors('2': Integer@99) = DeserializedClassDescriptor@100['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@100['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFun.lazy.log
index 62950ccf63d..ca395953a5f 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@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -244,24 +244,54 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
-TypeDeserializer@122 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@122 {
+    <name not found> = ArrayList@123[1] { ResolutionCandidate@124 }
+    <name not found> = ArrayList@125[1] { ResolutionCandidate@124 }
 }
 
-TypeDeserializer@125 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-TypeDeserializer@126 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-TypeDeserializer@127 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@130 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
index 11c752513a1..487de766720 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromExtensionInLocalClass.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
 }
@@ -164,116 +164,140 @@ LazyJavaPackageFragment@63['io'] {
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function0': Name@114) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function1': Name@115) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('io': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('jvm': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('reflect': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@119 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('io': Name@120) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('jvm': Name@121) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('reflect': Name@122) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
+    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
+    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction0': Name@128) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction1': Name@129) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-TypeDeserializer@134 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
index 12a0f3f193b..f59bd05f25d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalClass.lazy.log
@@ -52,6 +52,11 @@ DeserializedTypeParameterDescriptor@27['R'] {
     upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
 }
 
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@31
+    memberScope = DeserializedClassMemberScope@32
+}
+
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
     memberScope = DeserializedClassMemberScope@32
@@ -62,11 +67,6 @@ DeserializedType@26['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@32
 }
 
-DeserializedType@30['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@31
-    memberScope = DeserializedClassMemberScope@32
-}
-
 DeserializedType@33['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@31
 }
@@ -274,24 +274,60 @@ LazyJavaPackageFragment@18['reflect'] {
     memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
-TypeDeserializer@129 {
-    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
+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]
 }
 
-TypeDeserializer@132 {
-    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
+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]
 }
 
-TypeDeserializer@133 {
-    classDescriptors('2': Integer@130) = DeserializedClassDescriptor@131['Any']
+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]
 }
 
-TypeDeserializer@134 {
-    classDescriptors('3': Integer@135) = DeserializedClassDescriptor@131['Any']
-    classDescriptors('4': Integer@136) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-TypeDeserializer@137 {
-    classDescriptors('3': Integer@135) = DeserializedClassDescriptor@131['Any']
-    classDescriptors('4': Integer@136) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@153 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@158 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@161 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
index dc993de7587..2c4ccb8c9a6 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/localNamedFunFromLocalExtension.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
 }
@@ -164,116 +164,140 @@ LazyJavaPackageFragment@63['io'] {
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function0': Name@114) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function1': Name@115) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('io': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('jvm': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('reflect': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@119 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('io': Name@120) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('jvm': Name@121) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('reflect': Name@122) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
+    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
+    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction0': Name@128) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction1': Name@129) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@128 {
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@130 }
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@130 }
 }
 
-TypeDeserializer@134 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@132 {
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@134 }
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@134 }
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+ResolutionTaskHolder@136 {
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@138 }
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@138 }
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedName.lazy.log
index db6bab1f578..c348849c019 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@16['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@17
     memberScope = DeserializedClassMemberScope@18
 }
@@ -73,88 +73,149 @@ LazyJavaPackageFragment@24['<root>'] {
     classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('KMemberFunction0': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
     classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('kotlin': Name@58) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('kotlin': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('kotlin': Name@56) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
 LazyJavaPackageFragment@41['io'] {
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@61 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = LinkedHashMap@63 // through DeserializedPackageMemberScope@61
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
+    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@32['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('lang': Name@62) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@45['jvm'] {
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('ExtensionFunction0': Name@67) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Int': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('io': Name@72) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('jvm': Name@73) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('reflect': Name@74) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
+    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
+    properties('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
 }
 
 LazyJavaPackageFragment@34['lang'] {
-    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('a': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@77
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@78) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KMemberFunction0': Name@80) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+ResolutionTaskHolder@82 {
+    <name not found> = ArrayList@83[1] { ResolutionCandidate@84 }
+    <name not found> = ArrayList@85[1] { ResolutionCandidate@84 }
 }
 
-TypeDeserializer@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@86 {
+    <name not found> = ArrayList@87[1] { ResolutionCandidate@88 }
+    <name not found> = ArrayList@89[1] { ResolutionCandidate@88 }
+}
+
+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]
+    <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]
+    <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]
+}
+
+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@94 {
+    classDescriptors('2': Integer@95) = DeserializedClassDescriptor@96['Any']
+}
+
+TypeDeserializer@97 {
+    classDescriptors('3': Integer@98) = DeserializedClassDescriptor@96['Any']
+    classDescriptors('4': Integer@99) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
index 0358371eebc..2fa38ce05c3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/longQualifiedNameGeneric.lazy.log
@@ -38,7 +38,7 @@ DeserializedTypeParameterDescriptor@21['T'] {
     upperBoundsAsType = DeserializedType@24['kotlin.Any']
 }
 
-DeserializedType@16['kotlin.Any'] {
+DeserializedType@20['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -48,12 +48,12 @@ DeserializedType@24['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@12['kotlin.Any'] {
+DeserializedType@16['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
 
-DeserializedType@20['kotlin.Any'] {
+DeserializedType@12['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@25
     memberScope = DeserializedClassMemberScope@26
 }
@@ -113,91 +113,152 @@ LazyJavaPackageFragment@32['<root>'] {
     classes('KMemberFunction2': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@76
     classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    classes('kotlin': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@76
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    functions('kotlin': Name@84) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@76
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@76
+    classes('kotlin': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('kotlin': Name@82) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@60['io'] {
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = DeserializedPackageMemberScope@87 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = LinkedHashMap@89 // through DeserializedPackageMemberScope@87
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@87
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@45['java'] {
-    classes('lang': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@91
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@91
-    functions('lang': Name@92) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@91
-    memberIndex = computeMemberIndex$1@93 // through LazyPackageFragmentScopeForJavaPackage@91
+    classes('lang': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@87
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@87
+    functions('lang': Name@88) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@87
+    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
 }
 
 LazyJavaPackageFragment@67['jvm'] {
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@90
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('ExtensionFunction2': Name@98) = DeserializedClassDescriptor@2['ExtensionFunction2'] // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('io': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('jvm': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('reflect': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    deserializedPackageScope = DeserializedPackageMemberScope@102 // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('io': Name@103) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('jvm': Name@104) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    functions('reflect': Name@105) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@97
-    membersProtos = LinkedHashMap@107 // through DeserializedPackageMemberScope@102
-    properties('foo': Name@80) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('io': Name@103) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('jvm': Name@104) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
-    properties('reflect': Name@105) = EmptyList@83[empty] // through DeserializedPackageMemberScope@102
+    classes('Any': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('ExtensionFunction2': Name@93) = DeserializedClassDescriptor@2['ExtensionFunction2'] // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('Int': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('String': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('io': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('jvm': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    classes('reflect': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@92
+    deserializedPackageScope = DeserializedPackageMemberScope@97 // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('io': Name@98) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    functions('io': Name@98) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('jvm': Name@99) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    functions('jvm': Name@99) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    functions('reflect': Name@100) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    functions('reflect': Name@100) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@92
+    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@92
+    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@97
+    properties('io': Name@98) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    properties('jvm': Name@99) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
+    properties('reflect': Name@100) = EmptyList@83[empty] // through DeserializedPackageMemberScope@97
 }
 
 LazyJavaPackageFragment@47['lang'] {
-    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@80) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('a': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@103
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction2': Name@110) = DeserializedClassDescriptor@4['KMemberFunction2'] // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@82 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('KMemberFunction2': Name@112) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@113 // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('KMemberFunction2': Name@104) = DeserializedClassDescriptor@4['KMemberFunction2'] // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = Empty@81 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('KMemberFunction2': Name@106) = EmptyList@83[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
-TypeDeserializer@114 {
-    classDescriptors('2': Integer@115) = DeserializedClassDescriptor@116['Any']
+ResolutionTaskHolder@108 {
+    <name not found> = ArrayList@109[1] { ResolutionCandidate@110 }
+    <name not found> = ArrayList@111[1] { ResolutionCandidate@110 }
 }
 
-TypeDeserializer@117 {
-    classDescriptors('3': Integer@118) = DeserializedClassDescriptor@116['Any']
-    classDescriptors('4': Integer@119) = DeserializedClassDescriptor@2['ExtensionFunction2']
+ResolutionTaskHolder@112 {
+    <name not found> = ArrayList@113[1] { ResolutionCandidate@114 }
+    <name not found> = ArrayList@115[1] { ResolutionCandidate@114 }
+}
+
+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]
+    <name not found> = EmptyList@83[empty]
+    <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 {
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <name not found> = EmptyList@83[empty]
+    <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]
+}
+
+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@120 {
+    classDescriptors('2': Integer@121) = DeserializedClassDescriptor@122['Any']
+}
+
+TypeDeserializer@123 {
+    classDescriptors('3': Integer@124) = DeserializedClassDescriptor@122['Any']
+    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['ExtensionFunction2']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
index 41d7c17b178..479afe3f272 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromClass.lazy.log
@@ -58,17 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@18['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@34['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +68,17 @@ DeserializedType@22['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+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
 }
@@ -186,116 +186,152 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction0': Name@136) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction1': Name@137) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtension.lazy.log
index 3b70b10084e..7144bd789ed 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@18['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,7 +78,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@18['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -186,116 +186,152 @@ LazyJavaPackageFragment@71['io'] {
     properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
     properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('lang': Name@116) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
+    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
+    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction0': Name@122) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('ExtensionFunction1': Name@123) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('io': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('jvm': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('reflect': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = DeserializedPackageMemberScope@127 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('io': Name@128) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('jvm': Name@129) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    functions('reflect': Name@130) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@121
-    membersProtos = LinkedHashMap@132 // through DeserializedPackageMemberScope@127
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('io': Name@128) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('jvm': Name@129) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('reflect': Name@130) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('x': Name@111) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('y': Name@112) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
-    properties('z': Name@113) = EmptyList@104[empty] // through DeserializedPackageMemberScope@127
+    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
+    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
+    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
+    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@133
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
+    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction0': Name@136) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('KMemberFunction1': Name@137) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@135
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
+    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@140) = DeserializedClassDescriptor@141['Any']
+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]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@148 {
+    <name not found> = ArrayList@149[1] { ResolutionCandidate@150 }
+    <name not found> = ArrayList@151[1] { ResolutionCandidate@150 }
 }
 
-TypeDeserializer@147 {
-    classDescriptors('3': Integer@145) = DeserializedClassDescriptor@141['Any']
-    classDescriptors('4': Integer@146) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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 }
+}
+
+TypeDeserializer@160 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@163 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@161) = DeserializedClassDescriptor@162['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@168 {
+    classDescriptors('3': Integer@166) = DeserializedClassDescriptor@162['Any']
+    classDescriptors('4': Integer@167) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
index 780ebb4a9ea..69b251b5c47 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromExtensionInClass.lazy.log
@@ -58,12 +58,12 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@34['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -73,12 +73,12 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@34['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -187,116 +187,152 @@ LazyJavaPackageFragment@72['io'] {
     properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
     properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
     properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('x': Name@112) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('y': Name@113) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
-    properties('z': Name@114) = EmptyList@105[empty] // through DeserializedPackageMemberScope@109
 }
 
 LazyJavaPackageFragment@55['java'] {
-    classes('lang': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('lang': Name@117) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('lang': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('lang': Name@114) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
 LazyJavaPackageFragment@80['jvm'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@119
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@116
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@116
+    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@116
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('ExtensionFunction0': Name@123) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('ExtensionFunction1': Name@124) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Unit': Name@99) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('io': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('jvm': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('reflect': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = DeserializedPackageMemberScope@128 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('io': Name@129) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('io': Name@129) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('jvm': Name@130) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('jvm': Name@130) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('reflect': Name@131) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    functions('reflect': Name@131) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@122
-    membersProtos = LinkedHashMap@133 // through DeserializedPackageMemberScope@128
-    properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('io': Name@129) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('jvm': Name@130) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('reflect': Name@131) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('x': Name@112) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('y': Name@113) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
-    properties('z': Name@114) = EmptyList@105[empty] // through DeserializedPackageMemberScope@128
+    classes('Any': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('ExtensionFunction0': Name@120) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('ExtensionFunction1': Name@121) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Unit': Name@99) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('io': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('jvm': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('reflect': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    deserializedPackageScope = DeserializedPackageMemberScope@125 // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('io': Name@126) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('io': Name@126) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('jvm': Name@127) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('jvm': Name@127) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('reflect': Name@128) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    functions('reflect': Name@128) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@119
+    membersProtos = LinkedHashMap@130 // through DeserializedPackageMemberScope@125
+    properties('bar': Name@100) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('baz': Name@101) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('foo': Name@102) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('io': Name@126) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('jvm': Name@127) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
+    properties('reflect': Name@128) = EmptyList@105[empty] // through DeserializedPackageMemberScope@125
 }
 
 LazyJavaPackageFragment@57['lang'] {
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@134
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@131
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@131
+    memberIndex = computeMemberIndex$1@132 // through LazyPackageFragmentScopeForJavaPackage@131
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('KMemberFunction0': Name@137) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('KMemberFunction1': Name@138) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    memberIndex = computeMemberIndex$1@139 // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Int': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('KMemberFunction0': Name@134) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('KMemberFunction1': Name@135) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('String': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('Unit': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('bar': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('baz': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('foo': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    deserializedPackageScope = Empty@104 // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('bar': Name@100) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('baz': Name@101) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('foo': Name@102) = EmptyList@105[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@133
 }
 
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
+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]
 }
 
-TypeDeserializer@143 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
+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]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
 }
 
-TypeDeserializer@144 {
-    classDescriptors('2': Integer@141) = DeserializedClassDescriptor@142['Any']
+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]
+    <name not found> = EmptyList@105[empty]
+    <name not found> = EmptyList@105[empty]
 }
 
-TypeDeserializer@145 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@149 {
+    <name not found> = ArrayList@150[1] { ResolutionCandidate@151 }
+    <name not found> = ArrayList@152[1] { ResolutionCandidate@151 }
 }
 
-TypeDeserializer@148 {
-    classDescriptors('3': Integer@146) = DeserializedClassDescriptor@142['Any']
-    classDescriptors('4': Integer@147) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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 }
+}
+
+TypeDeserializer@161 {
+    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+}
+
+TypeDeserializer@164 {
+    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+}
+
+TypeDeserializer@165 {
+    classDescriptors('2': Integer@162) = DeserializedClassDescriptor@163['Any']
+}
+
+TypeDeserializer@166 {
+    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@163['Any']
+    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@2['ExtensionFunction0']
+}
+
+TypeDeserializer@169 {
+    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@163['Any']
+    classDescriptors('4': Integer@168) = DeserializedClassDescriptor@4['ExtensionFunction1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
index 94da45b6514..105efd80dd0 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/memberFromTopLevel.lazy.log
@@ -58,7 +58,7 @@ DeserializedTypeParameterDescriptor@31['T'] {
     upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -68,7 +68,12 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@35
+    memberScope = DeserializedClassMemberScope@36
+}
+
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
     memberScope = DeserializedClassMemberScope@36
 }
@@ -78,11 +83,6 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@36
 }
 
-DeserializedType@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@35
-    memberScope = DeserializedClassMemberScope@36
-}
-
 DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@35
 }
@@ -155,141 +155,327 @@ LazyJavaPackageFragment@46['<root>'] {
     classes('KMemberFunction1': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('kotlin': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('kotlin': Name@105) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@94
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@94
+    classes('kotlin': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@94
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@94
+    functions('kotlin': Name@101) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@94
+    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@94
 }
 
 LazyJavaPackageFragment@71['io'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = DeserializedPackageMemberScope@108 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
-    membersProtos = LinkedHashMap@110 // through DeserializedPackageMemberScope@108
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@108
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('lang': Name@113) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@112
+    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
+    deserializedPackageScope = Empty@100 // through LazyPackageFragmentScopeForJavaPackage@106
+    functions('lang': Name@107) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@106
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
 }
 
 LazyJavaPackageFragment@79['jvm'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@115
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@115
-    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@115
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@109
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction0': Name@119) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('ExtensionFunction1': Name@120) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('io': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('jvm': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    classes('reflect': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@118
-    deserializedPackageScope = DeserializedPackageMemberScope@124 // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('io': Name@125) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('jvm': Name@126) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    functions('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    functions('reflect': Name@127) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@118
-    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@118
-    membersProtos = LinkedHashMap@129 // through DeserializedPackageMemberScope@124
-    properties('bar': Name@99) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('baz': Name@100) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('foo': Name@101) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('io': Name@125) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('jvm': Name@126) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-    properties('reflect': Name@127) = EmptyList@104[empty] // through DeserializedPackageMemberScope@124
-}
-
-LazyJavaPackageFragment@56['lang'] {
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
+    classes('Any': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('ExtensionFunction0': Name@112) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('ExtensionFunction1': Name@113) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Unit': Name@98) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('io': Name@118) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    functions('io': Name@118) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('jvm': Name@119) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    functions('jvm': Name@119) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('reflect': Name@120) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    functions('reflect': Name@120) = EmptyList@102[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@111
+    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@117
+    properties('io': Name@118) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    properties('jvm': Name@119) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
+    properties('reflect': Name@120) = EmptyList@102[empty] // through DeserializedPackageMemberScope@117
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction0': Name@133) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('KMemberFunction1': Name@134) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('bar': Name@99) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('baz': Name@100) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('foo': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@103 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('bar': Name@99) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('baz': Name@100) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('foo': Name@101) = EmptyList@104[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Int': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('KMemberFunction0': Name@124) = DeserializedClassDescriptor@6['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('KMemberFunction1': Name@125) = DeserializedClassDescriptor@8['KMemberFunction1'] // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('String': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('Unit': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@123
 }
 
-TypeDeserializer@136 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@126 {
+    <name not found> = ArrayList@127[1] { ResolutionCandidate@128 }
+    <name not found> = ArrayList@129[1] { ResolutionCandidate@128 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@130 {
+    <name not found> = ArrayList@131[1] { ResolutionCandidate@132 }
+    <name not found> = ArrayList@133[1] { ResolutionCandidate@132 }
 }
 
-TypeDeserializer@140 {
-    classDescriptors('2': Integer@137) = DeserializedClassDescriptor@138['Any']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@141 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@138 {
+    <name not found> = ArrayList@139[1] { ResolutionCandidate@140 }
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@140 }
 }
 
-TypeDeserializer@144 {
-    classDescriptors('3': Integer@142) = DeserializedClassDescriptor@138['Any']
-    classDescriptors('4': Integer@143) = DeserializedClassDescriptor@4['ExtensionFunction1']
+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> = 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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+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]
+    <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 {
+    <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]
+}
+
+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]
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@161 {
+    <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@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 0231308a387..c4df29a088d 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromClass.lazy.log
@@ -74,69 +74,398 @@ LazyJavaPackageFragment@35['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@24['java'] {
-    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('lang': Name@62) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@40['jvm'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@64
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    memberIndex = computeMemberIndex$1@65 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Function0': Name@68) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('io': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('jvm': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('reflect': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('io': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('reflect': Name@75) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@76 // through LazyPackageFragmentScopeForJavaPackage@67
-    membersProtos = LinkedHashMap@77 // through DeserializedPackageMemberScope@72
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('io': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('reflect': Name@75) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('x': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('y': Name@59) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
+    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@65
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@26['lang'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@78
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@78
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@78
-    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@78
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@80) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@81
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@81
-    functions('KFunction0': Name@82) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@81
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@81
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@84 {
-    classDescriptors('2': Integer@85) = DeserializedClassDescriptor@86['Any']
+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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@87 {
-    classDescriptors('3': Integer@88) = DeserializedClassDescriptor@86['Any']
-    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
+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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@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 }
+    <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@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> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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 {
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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]
+}
+
+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 6cee0da81be..299b0e34adf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromExtension.lazy.log
@@ -75,69 +75,326 @@ LazyJavaPackageFragment@34['io'] {
     memberIndex = computeMemberIndex$1@56 // through LazyPackageFragmentScopeForJavaPackage@54
     membersProtos = LinkedHashMap@57 // through DeserializedPackageMemberScope@55
     properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
-    properties('y': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@55
 }
 
 LazyJavaPackageFragment@23['java'] {
-    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('lang': Name@61) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('lang': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@59
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@59
+    functions('lang': Name@60) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@59
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@39['jvm'] {
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@64 // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@62
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@62
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@62
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@62
 }
 
 LazyJavaPackageFragment@5['kotlin'] {
-    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Function0': Name@67) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
-    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('io': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('jvm': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    functions('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    functions('reflect': Name@74) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@66
-    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
-    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
-    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('io': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('jvm': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('reflect': Name@74) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
-    properties('y': Name@58) = EmptyList@51[empty] // through DeserializedPackageMemberScope@71
+    classes('Any': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Function0': Name@66) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Int': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('io': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('reflect': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    functions('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    functions('reflect': Name@73) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
+    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@65
+    membersProtos = LinkedHashMap@75 // through DeserializedPackageMemberScope@70
+    properties('Nested': Name@48) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
+    properties('reflect': Name@73) = EmptyList@51[empty] // through DeserializedPackageMemberScope@70
 }
 
 LazyJavaPackageFragment@25['lang'] {
-    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@77
-    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('Nested': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@76
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@76
+    functions('Nested': Name@48) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@76
+    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@76
 }
 
 LazyJavaPackageFragment@6['reflect'] {
-    classes('KFunction0': Name@79) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('KFunction0': Name@81) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('KFunction0': Name@78) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@79
+    deserializedPackageScope = Empty@50 // through LazyPackageFragmentScopeForJavaPackage@79
+    functions('KFunction0': Name@80) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@79
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@79
 }
 
-TypeDeserializer@83 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+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]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <name not found> = EmptyList@51[empty]
+    <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@86 {
-    classDescriptors('3': Integer@87) = DeserializedClassDescriptor@85['Any']
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['Function0']
+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]
+}
+
+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@98 {
+    <name not found> = ArrayList@99[1] { ResolutionCandidate@100 }
+    <name not found> = ArrayList@101[1] { ResolutionCandidate@100 }
+}
+
+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]
+    <name not found> = EmptyList@51[empty]
+    <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]
+}
+
+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]
+}
+
+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]
+    <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]
+}
+
+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 a7543bfb3f2..76f0235ffce 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/nestedConstructorFromTopLevel.lazy.log
@@ -92,11 +92,61 @@ LazyJavaPackageFragment@6['reflect'] {
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
-TypeDeserializer@67 {
-    classDescriptors('2': Integer@68) = DeserializedClassDescriptor@69['Any']
+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]
 }
 
-TypeDeserializer@70 {
-    classDescriptors('3': Integer@71) = DeserializedClassDescriptor@69['Any']
-    classDescriptors('4': Integer@72) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@71 {
+    <name not found> = ArrayList@72[1] { ResolutionCandidate@73 }
+    <name not found> = ArrayList@74[1] { ResolutionCandidate@73 }
+}
+
+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]
+    <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]
+    <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]
+}
+
+ResolutionTaskHolder@76 {
+    <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]
+    <name not found> = EmptyList@45[empty]
+    <name not found> = EmptyList@45[empty]
+}
+
+TypeDeserializer@77 {
+    classDescriptors('2': Integer@78) = DeserializedClassDescriptor@79['Any']
+}
+
+TypeDeserializer@80 {
+    classDescriptors('3': Integer@81) = DeserializedClassDescriptor@79['Any']
+    classDescriptors('4': Integer@82) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
index 2fcee59e184..db94cefb91e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityLocalVsTopLevel.lazy.log
@@ -100,10 +100,15 @@ LazyJavaPackageFragment@8['reflect'] {
     classes('KFunction0': Name@55) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@56
 }
 
-TypeDeserializer@57 {
-    classDescriptors('2': Integer@58) = DeserializedClassDescriptor@59['Any']
+ResolutionTaskHolder@57 {
+    <name not found> = ArrayList@58[1] { ResolutionCandidate@59 }
+    <name not found> = ArrayList@60[1] { ResolutionCandidate@59 }
 }
 
-TypeDeserializer@60 {
-    classDescriptors('4': Integer@61) = DeserializedClassDescriptor@2['Function0']
+TypeDeserializer@61 {
+    classDescriptors('2': Integer@62) = DeserializedClassDescriptor@63['Any']
+}
+
+TypeDeserializer@64 {
+    classDescriptors('4': Integer@65) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
index a706fd9d377..cb6f9958320 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsExtension.lazy.log
@@ -73,84 +73,142 @@ LazyJavaPackageFragmentProvider@22 {
 LazyJavaPackageFragment@24['<root>'] {
     classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@52
     classes('KMemberFunction0': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    functions('kotlin': Name@58) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@59 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('kotlin': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@52
+    functions('kotlin': Name@56) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@52
+    memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@52
 }
 
 LazyJavaPackageFragment@40['io'] {
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = DeserializedPackageMemberScope@61 // through LazyPackageFragmentScopeForJavaPackage@60
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
-    membersProtos = LinkedHashMap@63 // through DeserializedPackageMemberScope@61
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@61
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@59
 }
 
 LazyJavaPackageFragment@29['java'] {
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('lang': Name@66) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    memberIndex = computeMemberIndex$1@67 // through LazyPackageFragmentScopeForJavaPackage@65
+    classes('lang': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@61
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@61
+    functions('lang': Name@62) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@61
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
 }
 
 LazyJavaPackageFragment@45['jvm'] {
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@68
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@64
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('ExtensionFunction0': Name@72) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('reflect': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('io': Name@77) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('jvm': Name@78) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    functions('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    functions('reflect': Name@79) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@71
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@71
-    membersProtos = LinkedHashMap@81 // through DeserializedPackageMemberScope@76
-    properties('foo': Name@54) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('io': Name@77) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('jvm': Name@78) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-    properties('reflect': Name@79) = EmptyList@57[empty] // through DeserializedPackageMemberScope@76
-}
-
-LazyJavaPackageFragment@31['lang'] {
-    classes('foo': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@82
-    functions('foo': Name@54) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@82
-    memberIndex = computeMemberIndex$1@83 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('Any': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('ExtensionFunction0': Name@67) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('Int': Name@51) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('io': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('jvm': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    classes('reflect': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = DeserializedPackageMemberScope@71 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('io': Name@72) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('jvm': Name@73) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    functions('reflect': Name@74) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
+    membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@71
+    properties('io': Name@72) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('jvm': Name@73) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
+    properties('reflect': Name@74) = EmptyList@57[empty] // through DeserializedPackageMemberScope@71
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@84) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('KMemberFunction0': Name@86) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@87 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('KMemberFunction0': Name@77) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@78
+    deserializedPackageScope = Empty@55 // through LazyPackageFragmentScopeForJavaPackage@78
+    functions('KMemberFunction0': Name@79) = EmptyList@57[empty] // through LazyPackageFragmentScopeForJavaPackage@78
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@78
 }
 
-TypeDeserializer@88 {
-    classDescriptors('2': Integer@89) = DeserializedClassDescriptor@90['Any']
+ResolutionTaskHolder@81 {
+    <name not found> = ArrayList@82[1] { ResolutionCandidate@83 }
+    <name not found> = ArrayList@84[1] { ResolutionCandidate@83 }
 }
 
-TypeDeserializer@91 {
-    classDescriptors('3': Integer@92) = DeserializedClassDescriptor@90['Any']
-    classDescriptors('4': Integer@93) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@85 {
+    <name not found> = ArrayList@86[1] { ResolutionCandidate@87 }
+    <name not found> = ArrayList@88[1] { ResolutionCandidate@87 }
+}
+
+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]
+    <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 {
+    <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]
+    <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]
+}
+
+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@93 {
+    classDescriptors('2': Integer@94) = DeserializedClassDescriptor@95['Any']
+}
+
+TypeDeserializer@96 {
+    classDescriptors('3': Integer@97) = DeserializedClassDescriptor@95['Any']
+    classDescriptors('4': Integer@98) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
index bdb7381d28e..4f8abec671c 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/noAmbiguityMemberVsTopLevel.lazy.log
@@ -95,73 +95,85 @@ LazyJavaPackageFragment@41['io'] {
     memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@61
     membersProtos = LinkedHashMap@64 // through DeserializedPackageMemberScope@62
     properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
-    properties('x': Name@65) = EmptyList@58[empty] // through DeserializedPackageMemberScope@62
 }
 
 LazyJavaPackageFragment@30['java'] {
-    classes('lang': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('lang': Name@68) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('lang': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@66
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@66
+    functions('lang': Name@67) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@66
+    memberIndex = computeMemberIndex$1@68 // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
 LazyJavaPackageFragment@46['jvm'] {
-    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@70
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@70
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@70
-    memberIndex = computeMemberIndex$1@71 // through LazyPackageFragmentScopeForJavaPackage@70
+    classes('Unit': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@69
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@69
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@69
+    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@69
 }
 
 LazyJavaPackageFragment@7['kotlin'] {
-    classes('Any': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('ExtensionFunction0': Name@74) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Unit': Name@54) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('io': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('jvm': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('reflect': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = DeserializedPackageMemberScope@78 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('io': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('io': Name@79) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('jvm': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('jvm': Name@80) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('reflect': Name@81) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    functions('reflect': Name@81) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@73
-    membersProtos = LinkedHashMap@83 // through DeserializedPackageMemberScope@78
-    properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('io': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('jvm': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('reflect': Name@81) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
-    properties('x': Name@65) = EmptyList@58[empty] // through DeserializedPackageMemberScope@78
+    classes('Any': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('ExtensionFunction0': Name@73) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('Unit': Name@54) = DeserializedClassDescriptor@6['Unit'] // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('io': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('jvm': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('reflect': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = DeserializedPackageMemberScope@77 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('io': Name@78) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('io': Name@78) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('jvm': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('jvm': Name@79) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('reflect': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    functions('reflect': Name@80) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@72
+    membersProtos = LinkedHashMap@82 // through DeserializedPackageMemberScope@77
+    properties('foo': Name@55) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    properties('io': Name@78) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    properties('jvm': Name@79) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
+    properties('reflect': Name@80) = EmptyList@58[empty] // through DeserializedPackageMemberScope@77
 }
 
 LazyJavaPackageFragment@32['lang'] {
-    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@84
-    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    memberIndex = computeMemberIndex$1@85 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('foo': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('foo': Name@55) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@83
+    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }
 
 LazyJavaPackageFragment@8['reflect'] {
-    classes('KMemberFunction0': Name@86) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@87
-    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@87
-    functions('KMemberFunction0': Name@88) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@87
-    memberIndex = computeMemberIndex$1@89 // through LazyPackageFragmentScopeForJavaPackage@87
+    classes('KMemberFunction0': Name@85) = DeserializedClassDescriptor@4['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = Empty@57 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('KMemberFunction0': Name@87) = EmptyList@58[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@86
 }
 
-TypeDeserializer@90 {
-    classDescriptors('2': Integer@91) = DeserializedClassDescriptor@92['Any']
+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]
 }
 
-TypeDeserializer@93 {
-    classDescriptors('2': Integer@91) = DeserializedClassDescriptor@92['Any']
+ResolutionTaskHolder@93 {
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@95 }
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@95 }
 }
 
-TypeDeserializer@94 {
-    classDescriptors('3': Integer@95) = DeserializedClassDescriptor@92['Any']
-    classDescriptors('4': Integer@96) = DeserializedClassDescriptor@2['ExtensionFunction0']
+TypeDeserializer@97 {
+    classDescriptors('2': Integer@98) = DeserializedClassDescriptor@99['Any']
+}
+
+TypeDeserializer@100 {
+    classDescriptors('2': Integer@98) = DeserializedClassDescriptor@99['Any']
+}
+
+TypeDeserializer@101 {
+    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@99['Any']
+    classDescriptors('4': Integer@103) = DeserializedClassDescriptor@2['ExtensionFunction0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
index 53b5417ab65..cdbb120f7f1 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/renameOnImport.lazy.log
@@ -73,12 +73,17 @@ DeserializedTypeParameterDescriptor@39['T'] {
     upperBoundsAsType = DeserializedType@42['kotlin.Any']
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@38['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@30['kotlin.Any'] {
+DeserializedType@42['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@43
+    memberScope = DeserializedClassMemberScope@44
+}
+
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -93,12 +98,7 @@ DeserializedType@34['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@44
 }
 
-DeserializedType@42['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@43
-    memberScope = DeserializedClassMemberScope@44
-}
-
-DeserializedType@38['kotlin.Any'] {
+DeserializedType@30['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@43
     memberScope = DeserializedClassMemberScope@44
 }
@@ -201,154 +201,318 @@ LazyJavaPackageFragment@57['<root>'] {
     classes('KMemberFunction0': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@121
     classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@121
     classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('kotlin': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('other': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('kotlin': Name@135) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('other': Name@136) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('kotlin': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('other': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@121
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('kotlin': Name@134) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    functions('other': Name@135) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@121
+    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
 LazyJavaPackageFragment@88['io'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@138
-    deserializedPackageScope = DeserializedPackageMemberScope@140 // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@138
-    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@138
-    membersProtos = LinkedHashMap@142 // through DeserializedPackageMemberScope@140
-    properties('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    properties('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
-    properties('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@140
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@137
+    deserializedPackageScope = DeserializedPackageMemberScope@139 // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@137
+    memberIndex = computeMemberIndex$1@140 // through LazyPackageFragmentScopeForJavaPackage@137
+    membersProtos = LinkedHashMap@141 // through DeserializedPackageMemberScope@139
+    properties('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@139
 }
 
 LazyJavaPackageFragment@67['java'] {
-    classes('lang': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@144
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@144
-    functions('lang': Name@145) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@144
-    memberIndex = computeMemberIndex$1@146 // through LazyPackageFragmentScopeForJavaPackage@144
+    classes('lang': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@143
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@143
+    functions('lang': Name@144) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@143
+    memberIndex = computeMemberIndex$1@145 // through LazyPackageFragmentScopeForJavaPackage@143
 }
 
 LazyJavaPackageFragment@98['jvm'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@147
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@147
-    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@147
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@146
 }
 
 LazyJavaPackageFragment@17['kotlin'] {
-    classes('Any': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('ExtensionFunction0': Name@151) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('ExtensionFunction1': Name@152) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('Function0': Name@153) = DeserializedClassDescriptor@6['Function0'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('String': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('Unit': Name@127) = DeserializedClassDescriptor@14['Unit'] // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('io': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('jvm': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    classes('reflect': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@150
-    deserializedPackageScope = DeserializedPackageMemberScope@157 // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('io': Name@158) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('io': Name@158) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('jvm': Name@159) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('jvm': Name@159) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    functions('reflect': Name@160) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    functions('reflect': Name@160) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@150
-    memberIndex = computeMemberIndex$1@161 // through LazyPackageFragmentScopeForJavaPackage@150
-    membersProtos = LinkedHashMap@162 // through DeserializedPackageMemberScope@157
-    properties('bar': Name@128) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('bazbaz': Name@129) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('foofoo': Name@130) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('io': Name@158) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('jvm': Name@159) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
-    properties('reflect': Name@160) = EmptyList@134[empty] // through DeserializedPackageMemberScope@157
+    classes('Any': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('ExtensionFunction0': Name@150) = DeserializedClassDescriptor@2['ExtensionFunction0'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('ExtensionFunction1': Name@151) = DeserializedClassDescriptor@4['ExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Function0': Name@152) = DeserializedClassDescriptor@6['Function0'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('String': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Unit': Name@127) = DeserializedClassDescriptor@14['Unit'] // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('io': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('jvm': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('reflect': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    deserializedPackageScope = DeserializedPackageMemberScope@156 // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('io': Name@157) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('io': Name@157) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('jvm': Name@158) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('jvm': Name@158) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('reflect': Name@159) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    functions('reflect': Name@159) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@149
+    membersProtos = LinkedHashMap@161 // through DeserializedPackageMemberScope@156
+    properties('foofoo': Name@129) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    properties('io': Name@157) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    properties('jvm': Name@158) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
+    properties('reflect': Name@159) = EmptyList@133[empty] // through DeserializedPackageMemberScope@156
 }
 
 LazyJavaPackageFragment@69['lang'] {
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@163
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@163
-    memberIndex = computeMemberIndex$1@164 // through LazyPackageFragmentScopeForJavaPackage@163
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@162
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@162
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@162
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@162
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@162
+    memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@162
 }
 
 LazyJavaPackageFragment@18['reflect'] {
-    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('KExtensionFunction1': Name@166) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('KFunction0': Name@167) = DeserializedClassDescriptor@10['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('KMemberFunction0': Name@168) = DeserializedClassDescriptor@12['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('bar': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('bazbaz': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    classes('foofoo': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@165
-    deserializedPackageScope = Empty@133 // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('bar': Name@128) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('bazbaz': Name@129) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    functions('foofoo': Name@130) = EmptyList@134[empty] // through LazyPackageFragmentScopeForJavaPackage@165
-    memberIndex = computeMemberIndex$1@169 // through LazyPackageFragmentScopeForJavaPackage@165
+    classes('Int': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('KExtensionFunction1': Name@165) = DeserializedClassDescriptor@8['KExtensionFunction1'] // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('KFunction0': Name@166) = DeserializedClassDescriptor@10['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('KMemberFunction0': Name@167) = DeserializedClassDescriptor@12['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('String': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('Unit': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('bazbaz': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('foofoo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('bazbaz': Name@128) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('foofoo': Name@129) = EmptyList@133[empty] // through LazyPackageFragmentScopeForJavaPackage@164
+    memberIndex = computeMemberIndex$1@168 // through LazyPackageFragmentScopeForJavaPackage@164
 }
 
-TypeDeserializer@170 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+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]
 }
 
-TypeDeserializer@173 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+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]
+    <name not found> = EmptyList@133[empty]
+    <name not found> = EmptyList@133[empty]
 }
 
-TypeDeserializer@174 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+ResolutionTaskHolder@177 {
+    <name not found> = ArrayList@178[1] { ResolutionCandidate@179 }
+    <name not found> = ArrayList@180[1] { ResolutionCandidate@179 }
 }
 
-TypeDeserializer@175 {
-    classDescriptors('2': Integer@171) = DeserializedClassDescriptor@172['Any']
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
 }
 
-TypeDeserializer@176 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@178) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@185 {
+    <name not found> = ArrayList@186[1] { ResolutionCandidate@187 }
+    <name not found> = ArrayList@188[1] { ResolutionCandidate@187 }
 }
 
-TypeDeserializer@179 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@178) = DeserializedClassDescriptor@4['ExtensionFunction1']
+ResolutionTaskHolder@189 {
+    <name not found> = ArrayList@190[1] { ResolutionCandidate@191 }
+    <name not found> = ArrayList@192[1] { ResolutionCandidate@191 }
 }
 
-TypeDeserializer@180 {
-    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@172['Any']
-    classDescriptors('4': Integer@178) = DeserializedClassDescriptor@6['Function0']
+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]
+    <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 {
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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@201 {
+    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+}
+
+TypeDeserializer@204 {
+    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+}
+
+TypeDeserializer@205 {
+    classDescriptors('2': Integer@202) = DeserializedClassDescriptor@203['Any']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromClass.lazy.log
index 8b0f722f1f8..646e38f0eca 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@26['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@27
-    memberScope = DeserializedClassMemberScope@28
-}
-
 DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
@@ -61,6 +56,11 @@ DeserializedType@18['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@28
 }
 
+DeserializedType@26['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@27
+    memberScope = DeserializedClassMemberScope@28
+}
+
 DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
 }
@@ -159,116 +159,188 @@ LazyJavaPackageFragment@61['io'] {
     properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
     properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
     properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('x': Name@98) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('y': Name@99) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
-    properties('z': Name@100) = EmptyList@91[empty] // through DeserializedPackageMemberScope@95
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@102
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@102
-    functions('lang': Name@103) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
-    memberIndex = computeMemberIndex$1@104 // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('lang': Name@98) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('lang': Name@100) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
 LazyJavaPackageFragment@68['jvm'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@105
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
-    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@102
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@102
+    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@102
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Function0': Name@109) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Function1': Name@110) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('Unit': Name@85) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('io': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('jvm': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('reflect': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = DeserializedPackageMemberScope@114 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('io': Name@115) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('io': Name@115) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('jvm': Name@116) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('jvm': Name@116) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('reflect': Name@117) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    functions('reflect': Name@117) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@108
-    membersProtos = LinkedHashMap@119 // through DeserializedPackageMemberScope@114
-    properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('io': Name@115) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('jvm': Name@116) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('reflect': Name@117) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('x': Name@98) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('y': Name@99) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
-    properties('z': Name@100) = EmptyList@91[empty] // through DeserializedPackageMemberScope@114
+    classes('Any': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Function0': Name@106) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Function1': Name@107) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('Unit': Name@85) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('io': Name@108) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('jvm': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    classes('reflect': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = DeserializedPackageMemberScope@111 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('io': Name@112) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('io': Name@112) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('jvm': Name@113) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('jvm': Name@113) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('reflect': Name@114) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    functions('reflect': Name@114) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@115 // through LazyPackageFragmentScopeForJavaPackage@105
+    membersProtos = LinkedHashMap@116 // through DeserializedPackageMemberScope@111
+    properties('bar': Name@86) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('baz': Name@87) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('foo': Name@88) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('io': Name@112) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('jvm': Name@113) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
+    properties('reflect': Name@114) = EmptyList@91[empty] // through DeserializedPackageMemberScope@111
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@120
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@120
-    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@120
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@117
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@117
+    memberIndex = computeMemberIndex$1@118 // through LazyPackageFragmentScopeForJavaPackage@117
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('KFunction0': Name@123) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('KFunction1': Name@124) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@122
-    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@122
-    memberIndex = computeMemberIndex$1@125 // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('Int': Name@80) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('KFunction0': Name@120) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('KFunction1': Name@121) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('String': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('Unit': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('bar': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('baz': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    classes('foo': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@119
+    deserializedPackageScope = Empty@90 // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('bar': Name@86) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('baz': Name@87) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    functions('foo': Name@88) = EmptyList@91[empty] // through LazyPackageFragmentScopeForJavaPackage@119
+    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@119
 }
 
-TypeDeserializer@126 {
-    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@129 {
-    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@130 {
-    classDescriptors('2': Integer@127) = DeserializedClassDescriptor@128['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@131 {
-    classDescriptors('3': Integer@132) = DeserializedClassDescriptor@128['Any']
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
 }
 
-TypeDeserializer@134 {
-    classDescriptors('3': Integer@132) = DeserializedClassDescriptor@128['Any']
-    classDescriptors('4': Integer@133) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@147 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+}
+
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+}
+
+TypeDeserializer@151 {
+    classDescriptors('2': Integer@148) = DeserializedClassDescriptor@149['Any']
+}
+
+TypeDeserializer@152 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@149['Any']
+    classDescriptors('4': Integer@154) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtension.lazy.log
index 95729e08f1f..09d0b3d4e63 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@26['kotlin.Any'] {
+DeserializedType@22['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
 
-DeserializedType@22['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@27
     memberScope = DeserializedClassMemberScope@28
 }
@@ -164,116 +164,188 @@ LazyJavaPackageFragment@63['io'] {
     properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
     properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@46['java'] {
-    classes('lang': Name@106) = null // through LazyPackageFragmentScopeForJavaPackage@107
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
-    functions('lang': Name@108) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
-    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@71['jvm'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function0': Name@114) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Function1': Name@115) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('io': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('jvm': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('reflect': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = DeserializedPackageMemberScope@119 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('io': Name@120) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('jvm': Name@121) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    functions('reflect': Name@122) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@113
-    membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@119
-    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('io': Name@120) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('jvm': Name@121) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('reflect': Name@122) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('x': Name@103) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('y': Name@104) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
-    properties('z': Name@105) = EmptyList@96[empty] // through DeserializedPackageMemberScope@119
+    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function0': Name@111) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Function1': Name@112) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Unit': Name@90) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('reflect': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('io': Name@117) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('jvm': Name@118) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    functions('reflect': Name@119) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@121 // through DeserializedPackageMemberScope@116
+    properties('bar': Name@91) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('baz': Name@92) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('foo': Name@93) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('io': Name@117) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('jvm': Name@118) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
+    properties('reflect': Name@119) = EmptyList@96[empty] // through DeserializedPackageMemberScope@116
 }
 
 LazyJavaPackageFragment@48['lang'] {
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@125
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@122
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@122
+    memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@122
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction0': Name@128) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('KFunction1': Name@129) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Int': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction0': Name@125) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KFunction1': Name@126) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('String': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Unit': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('bar': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('baz': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('foo': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@124
+    deserializedPackageScope = Empty@95 // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('bar': Name@91) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('baz': Name@92) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    functions('foo': Name@93) = EmptyList@96[empty] // through LazyPackageFragmentScopeForJavaPackage@124
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@124
 }
 
-TypeDeserializer@131 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@134 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@132) = DeserializedClassDescriptor@133['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@136 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@140 {
+    <name not found> = ArrayList@141[1] { ResolutionCandidate@142 }
+    <name not found> = ArrayList@143[1] { ResolutionCandidate@142 }
 }
 
-TypeDeserializer@139 {
-    classDescriptors('3': Integer@137) = DeserializedClassDescriptor@133['Any']
-    classDescriptors('4': Integer@138) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@152 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@155 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@160 {
+    classDescriptors('3': Integer@158) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromExtensionInClass.lazy.log
index d276e677812..0f721b5b794 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@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
 }
@@ -165,116 +165,248 @@ LazyJavaPackageFragment@64['io'] {
     properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
     properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
     properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('x': Name@104) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('y': Name@105) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
-    properties('z': Name@106) = EmptyList@97[empty] // through DeserializedPackageMemberScope@101
 }
 
 LazyJavaPackageFragment@47['java'] {
-    classes('lang': Name@107) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('lang': Name@109) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('lang': Name@104) = null // through LazyPackageFragmentScopeForJavaPackage@105
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@105
+    functions('lang': Name@106) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@105
+    memberIndex = computeMemberIndex$1@107 // through LazyPackageFragmentScopeForJavaPackage@105
 }
 
 LazyJavaPackageFragment@72['jvm'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@111
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
-    memberIndex = computeMemberIndex$1@112 // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@108
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@108
+    memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Function0': Name@115) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Function1': Name@116) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('Unit': Name@91) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('io': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('jvm': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    classes('reflect': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@114
-    deserializedPackageScope = DeserializedPackageMemberScope@120 // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('io': Name@121) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('io': Name@121) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('jvm': Name@122) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('jvm': Name@122) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    functions('reflect': Name@123) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    functions('reflect': Name@123) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@114
-    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@114
-    membersProtos = LinkedHashMap@125 // through DeserializedPackageMemberScope@120
-    properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('io': Name@121) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('jvm': Name@122) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('reflect': Name@123) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('x': Name@104) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('y': Name@105) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
-    properties('z': Name@106) = EmptyList@97[empty] // through DeserializedPackageMemberScope@120
+    classes('Any': Name@110) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Function0': Name@112) = DeserializedClassDescriptor@2['Function0'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Function1': Name@113) = DeserializedClassDescriptor@4['Function1'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('Unit': Name@91) = DeserializedClassDescriptor@10['Unit'] // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    classes('reflect': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@111
+    deserializedPackageScope = DeserializedPackageMemberScope@117 // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('io': Name@118) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('jvm': Name@119) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    functions('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    functions('reflect': Name@120) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@111
+    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@111
+    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@117
+    properties('bar': Name@92) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('baz': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('foo': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('io': Name@118) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('jvm': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
+    properties('reflect': Name@120) = EmptyList@97[empty] // through DeserializedPackageMemberScope@117
 }
 
 LazyJavaPackageFragment@49['lang'] {
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@126
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@126
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    memberIndex = computeMemberIndex$1@124 // through LazyPackageFragmentScopeForJavaPackage@123
 }
 
 LazyJavaPackageFragment@14['reflect'] {
-    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('KFunction0': Name@129) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('KFunction1': Name@130) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@128
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@128
-    memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('Int': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('KFunction0': Name@126) = DeserializedClassDescriptor@6['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('KFunction1': Name@127) = DeserializedClassDescriptor@8['KFunction1'] // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('String': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('Unit': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('bar': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('baz': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('foo': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('bar': Name@92) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('baz': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('foo': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    memberIndex = computeMemberIndex$1@128 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
-TypeDeserializer@132 {
-    classDescriptors('2': Integer@133) = DeserializedClassDescriptor@134['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@135 {
-    classDescriptors('2': Integer@133) = DeserializedClassDescriptor@134['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@136 {
-    classDescriptors('2': Integer@133) = DeserializedClassDescriptor@134['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@137 {
-    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@134['Any']
-    classDescriptors('4': Integer@139) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@141 {
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@143 }
+    <name not found> = ArrayList@144[1] { ResolutionCandidate@143 }
 }
 
-TypeDeserializer@140 {
-    classDescriptors('3': Integer@138) = DeserializedClassDescriptor@134['Any']
-    classDescriptors('4': Integer@139) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@153 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('2': Integer@154) = DeserializedClassDescriptor@155['Any']
+}
+
+TypeDeserializer@158 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@161 {
+    classDescriptors('3': Integer@159) = DeserializedClassDescriptor@155['Any']
+    classDescriptors('4': Integer@160) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
index 7ea31aa246a..3f5d89d3d2b 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/topLevelFromTopLevel.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
 }
@@ -244,24 +244,66 @@ LazyJavaPackageFragment@14['reflect'] {
     memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
-TypeDeserializer@122 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+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]
 }
 
-TypeDeserializer@125 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
 }
 
-TypeDeserializer@126 {
-    classDescriptors('2': Integer@123) = DeserializedClassDescriptor@124['Any']
+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]
+    <name not found> = EmptyList@90[empty]
+    <name not found> = EmptyList@90[empty]
 }
 
-TypeDeserializer@127 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@2['Function0']
+ResolutionTaskHolder@134 {
+    <name not found> = ArrayList@135[1] { ResolutionCandidate@136 }
+    <name not found> = ArrayList@137[1] { ResolutionCandidate@136 }
 }
 
-TypeDeserializer@130 {
-    classDescriptors('3': Integer@128) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@129) = DeserializedClassDescriptor@4['Function1']
+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 }
+}
+
+TypeDeserializer@146 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@149 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@150 {
+    classDescriptors('2': Integer@147) = DeserializedClassDescriptor@148['Any']
+}
+
+TypeDeserializer@151 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@2['Function0']
+}
+
+TypeDeserializer@154 {
+    classDescriptors('3': Integer@152) = DeserializedClassDescriptor@148['Any']
+    classDescriptors('4': Integer@153) = DeserializedClassDescriptor@4['Function1']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
index 3ee494d97e8..ad1151cb6a2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/function/unresolved.lazy.log
@@ -124,10 +124,282 @@ LazyJavaPackageFragment@6['reflect'] {
     classes('KFunction0': Name@65) = DeserializedClassDescriptor@4['KFunction0'] // through LazyPackageFragmentScopeForJavaPackage@66
 }
 
-TypeDeserializer@67 {
-    classDescriptors('2': Integer@68) = DeserializedClassDescriptor@69['Any']
+ResolutionTaskHolder@67 {
+    <name not found> = ArrayList@68[1] { ResolutionCandidate@69 }
+    <name not found> = ArrayList@70[1] { ResolutionCandidate@69 }
 }
 
-TypeDeserializer@70 {
-    classDescriptors('4': Integer@71) = DeserializedClassDescriptor@2['Function0']
+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]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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 {
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <name not found> = EmptyList@41[empty]
+    <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@85 {
+    classDescriptors('2': Integer@86) = DeserializedClassDescriptor@87['Any']
+}
+
+TypeDeserializer@88 {
+    classDescriptors('4': Integer@89) = DeserializedClassDescriptor@2['Function0']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
index b1348b35225..abc7b1d1eb2 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/abstractPropertyViaSubclasses.lazy.log
@@ -14,330 +14,861 @@ DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
     membersProtos = LinkedHashMap@15 // through DeserializedClassMemberScope@14
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
+    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
 }
 
 DeserializedClassDescriptor@4['KMemberProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    defaultType = JetTypeImpl@16['KMemberProperty<2>']
-    functions('get': Name@12) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@18['get'] } // through DeserializedClassMemberScope@19
-    membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@19
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@19
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
+    defaultType = JetTypeImpl@17['KMemberProperty<2>']
+    functions('get': Name@12) = ArrayList@18[1] { DeserializedSimpleFunctionDescriptor@19['get'] } // through DeserializedClassMemberScope@20
+    membersProtos = LinkedHashMap@21 // through DeserializedClassMemberScope@20
+    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedClassMemberScope@20
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@22['<this>']
 }
 
 DeserializedClassDescriptor@6['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
-    membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
+    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@23
+    membersProtos = LinkedHashMap@24 // through DeserializedClassMemberScope@23
+    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedClassMemberScope@23
 }
 
-DeserializedTypeParameterDescriptor@24['R'] {
-    defaultType = JetTypeImpl@25['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@26
-    upperBounds = LinkedHashSet@27[1] { DeserializedType@28['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@25['R'] {
+    defaultType = JetTypeImpl@26['R']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@27
+    upperBounds = LinkedHashSet@28[1] { DeserializedType@29['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@29['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@30
+DeserializedTypeParameterDescriptor@30['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@31
 }
 
-DeserializedTypeParameterDescriptor@31['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
+DeserializedTypeParameterDescriptor@32['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@33
 }
 
-DeserializedTypeParameterDescriptor@33['T'] {
-    defaultType = JetTypeImpl@34['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@35
-    upperBounds = LinkedHashSet@36[1] { DeserializedType@37['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@34['T'] {
+    defaultType = JetTypeImpl@35['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@36
+    upperBounds = LinkedHashSet@37[1] { DeserializedType@38['kotlin.Any'] }
 }
 
-DeserializedType@38['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+DeserializedType@39['R in kotlin.reflect.KMemberProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@27
 }
 
-DeserializedType@39['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@35
+DeserializedType@40['T in kotlin.reflect.KMemberProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@36
 }
 
-DeserializedType@40['kotlin.Any'] {
+DeserializedType@29['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@41
     memberScope = DeserializedClassMemberScope@42
 }
 
-DeserializedType@37['kotlin.Any'] {
+DeserializedType@38['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@41
     memberScope = DeserializedClassMemberScope@42
 }
 
-DeserializedType@28['kotlin.Any'] {
+DeserializedType@43['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@41
     memberScope = DeserializedClassMemberScope@42
 }
 
-DeserializedType@43['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@44
+DeserializedType@44['kotlin.CharSequence'] {
+    constructor = DeserializedClassTypeConstructor@45
 }
 
-DeserializedType@45['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@44
+DeserializedType@46['kotlin.CharSequence'] {
+    constructor = DeserializedClassTypeConstructor@45
 }
 
-DeserializedType@46['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@47
+DeserializedType@47['kotlin.Int'] {
+    constructor = DeserializedClassTypeConstructor@48
 }
 
-DeserializedType@48['kotlin.Int'] {
-    constructor = DeserializedClassTypeConstructor@47
+DeserializedType@49['kotlin.Int'] {
+    constructor = DeserializedClassTypeConstructor@48
 }
 
-DeserializedType@49['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@50
-    memberScope = SubstitutingScope@51
+DeserializedType@50['kotlin.reflect.KCallable'] {
+    constructor = DeserializedClassTypeConstructor@51
+    memberScope = SubstitutingScope@52
 }
 
-DeserializedType@52['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@53
-    memberScope = SubstitutingScope@54
+DeserializedType@53['kotlin.reflect.KProperty'] {
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = SubstitutingScope@55
 }
 
-EnumEntryClassDescriptors@55 {
+EnumEntryClassDescriptors@56 {
     findEnumEntry('get': Name@12) = null
 }
 
-LazyJavaPackageFragmentProvider@56 {
-    packageFragments('<root>': FqName@57) = LazyJavaPackageFragment@58['<root>']
-    packageFragments('A': FqName@59) = null
-    packageFragments('Any': FqName@60) = null
-    packageFragments('B': FqName@61) = null
-    packageFragments('Base': FqName@62) = null
-    packageFragments('C': FqName@63) = null
-    packageFragments('Int': FqName@64) = null
-    packageFragments('KMemberProperty': FqName@65) = null
-    packageFragments('Number': FqName@66) = null
-    packageFragments('String': FqName@67) = null
-    packageFragments('java': FqName@68) = LazyJavaPackageFragment@69['java']
-    packageFragments('java.lang': FqName@70) = LazyJavaPackageFragment@71['lang']
-    packageFragments('java.lang.A': FqName@72) = null
-    packageFragments('java.lang.Any': FqName@73) = null
-    packageFragments('java.lang.B': FqName@74) = null
-    packageFragments('java.lang.Base': FqName@75) = null
-    packageFragments('java.lang.Int': FqName@76) = null
-    packageFragments('java.lang.KMemberProperty': FqName@77) = null
-    packageFragments('java.lang.Number': FqName@78) = null
-    packageFragments('java.lang.String': FqName@79) = null
-    packageFragments('kotlin': FqName@80) = LazyJavaPackageFragment@81['kotlin']
-    packageFragments('kotlin.A': FqName@82) = null
-    packageFragments('kotlin.Any': FqName@83) = null
-    packageFragments('kotlin.B': FqName@84) = null
-    packageFragments('kotlin.Base': FqName@85) = null
-    packageFragments('kotlin.Int': FqName@86) = null
-    packageFragments('kotlin.KMemberProperty': FqName@87) = null
-    packageFragments('kotlin.Number': FqName@88) = null
-    packageFragments('kotlin.String': FqName@89) = null
-    packageFragments('kotlin.io': FqName@90) = LazyJavaPackageFragment@91['io']
-    packageFragments('kotlin.io.A': FqName@92) = null
-    packageFragments('kotlin.io.Any': FqName@93) = null
-    packageFragments('kotlin.io.B': FqName@94) = null
-    packageFragments('kotlin.io.Base': FqName@95) = null
-    packageFragments('kotlin.io.Int': FqName@96) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@97) = null
-    packageFragments('kotlin.io.Number': FqName@98) = null
-    packageFragments('kotlin.io.String': FqName@99) = null
-    packageFragments('kotlin.jvm': FqName@100) = LazyJavaPackageFragment@101['jvm']
-    packageFragments('kotlin.jvm.A': FqName@102) = null
-    packageFragments('kotlin.jvm.Any': FqName@103) = null
-    packageFragments('kotlin.jvm.B': FqName@104) = null
-    packageFragments('kotlin.jvm.Base': FqName@105) = null
-    packageFragments('kotlin.jvm.Int': FqName@106) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@107) = null
-    packageFragments('kotlin.jvm.Number': FqName@108) = null
-    packageFragments('kotlin.jvm.String': FqName@109) = null
-    packageFragments('kotlin.reflect': FqName@110) = LazyJavaPackageFragment@11['reflect']
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@111) = null
+LazyJavaPackageFragmentProvider@57 {
+    packageFragments('<root>': FqName@58) = LazyJavaPackageFragment@59['<root>']
+    packageFragments('A': FqName@60) = null
+    packageFragments('Any': FqName@61) = null
+    packageFragments('B': FqName@62) = null
+    packageFragments('Base': FqName@63) = null
+    packageFragments('C': FqName@64) = null
+    packageFragments('Int': FqName@65) = null
+    packageFragments('KMemberProperty': FqName@66) = null
+    packageFragments('Number': FqName@67) = null
+    packageFragments('String': FqName@68) = null
+    packageFragments('java': FqName@69) = LazyJavaPackageFragment@70['java']
+    packageFragments('java.lang': FqName@71) = LazyJavaPackageFragment@72['lang']
+    packageFragments('java.lang.A': FqName@73) = null
+    packageFragments('java.lang.Any': FqName@74) = null
+    packageFragments('java.lang.B': FqName@75) = null
+    packageFragments('java.lang.Base': FqName@76) = null
+    packageFragments('java.lang.Int': FqName@77) = null
+    packageFragments('java.lang.KMemberProperty': FqName@78) = null
+    packageFragments('java.lang.Number': FqName@79) = null
+    packageFragments('java.lang.String': FqName@80) = null
+    packageFragments('kotlin': FqName@81) = LazyJavaPackageFragment@82['kotlin']
+    packageFragments('kotlin.A': FqName@83) = null
+    packageFragments('kotlin.Any': FqName@84) = null
+    packageFragments('kotlin.B': FqName@85) = null
+    packageFragments('kotlin.Base': FqName@86) = null
+    packageFragments('kotlin.Int': FqName@87) = null
+    packageFragments('kotlin.KMemberProperty': FqName@88) = null
+    packageFragments('kotlin.Number': FqName@89) = null
+    packageFragments('kotlin.String': FqName@90) = null
+    packageFragments('kotlin.io': FqName@91) = LazyJavaPackageFragment@92['io']
+    packageFragments('kotlin.io.A': FqName@93) = null
+    packageFragments('kotlin.io.Any': FqName@94) = null
+    packageFragments('kotlin.io.B': FqName@95) = null
+    packageFragments('kotlin.io.Base': FqName@96) = null
+    packageFragments('kotlin.io.Int': FqName@97) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@98) = null
+    packageFragments('kotlin.io.Number': FqName@99) = null
+    packageFragments('kotlin.io.String': FqName@100) = null
+    packageFragments('kotlin.jvm': FqName@101) = LazyJavaPackageFragment@102['jvm']
+    packageFragments('kotlin.jvm.A': FqName@103) = null
+    packageFragments('kotlin.jvm.Any': FqName@104) = null
+    packageFragments('kotlin.jvm.B': FqName@105) = null
+    packageFragments('kotlin.jvm.Base': FqName@106) = null
+    packageFragments('kotlin.jvm.Int': FqName@107) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@108) = null
+    packageFragments('kotlin.jvm.Number': FqName@109) = null
+    packageFragments('kotlin.jvm.String': FqName@110) = null
+    packageFragments('kotlin.reflect': FqName@111) = LazyJavaPackageFragment@11['reflect']
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@112) = null
 }
 
-LazyJavaPackageFragment@58['<root>'] {
-    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('KMemberProperty': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('kotlin': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('kotlin': Name@125) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@126 // through LazyPackageFragmentScopeForJavaPackage@113
+LazyJavaPackageFragment@59['<root>'] {
+    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('KMemberProperty': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('kotlin': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@114
+    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('kotlin': Name@126) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@114
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@114
 }
 
-LazyJavaPackageFragment@91['io'] {
-    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = DeserializedPackageMemberScope@128 // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('invoke': Name@121) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    functions('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@129 // through LazyPackageFragmentScopeForJavaPackage@127
-    membersProtos = LinkedHashMap@130 // through DeserializedPackageMemberScope@128
-    properties('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    properties('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    properties('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
-    properties('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@128
+LazyJavaPackageFragment@92['io'] {
+    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@128
+    deserializedPackageScope = DeserializedPackageMemberScope@129 // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('get': Name@16) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('invoke': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    functions('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@128
+    memberIndex = computeMemberIndex$1@130 // through LazyPackageFragmentScopeForJavaPackage@128
+    membersProtos = LinkedHashMap@131 // through DeserializedPackageMemberScope@129
+    properties('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    properties('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    properties('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
+    properties('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@129
 }
 
-LazyJavaPackageFragment@69['java'] {
-    classes('lang': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('lang': Name@133) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@134 // through LazyPackageFragmentScopeForJavaPackage@132
+LazyJavaPackageFragment@70['java'] {
+    classes('lang': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('lang': Name@134) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    memberIndex = computeMemberIndex$1@135 // through LazyPackageFragmentScopeForJavaPackage@133
 }
 
-LazyJavaPackageFragment@101['jvm'] {
-    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@135
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@135
-    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@135
+LazyJavaPackageFragment@102['jvm'] {
+    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@136
+    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@136
 }
 
-LazyJavaPackageFragment@81['kotlin'] {
-    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Any': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('CharSequence': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Int': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('Number': Name@119) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('String': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('io': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('jvm': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('reflect': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@137
-    deserializedPackageScope = DeserializedPackageMemberScope@142 // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('get': Name@12) = ArrayList@143[2] { DeserializedSimpleFunctionDescriptor@144['get'], DeserializedSimpleFunctionDescriptor@145['get'] } // through DeserializedPackageMemberScope@142
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('invoke': Name@121) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('io': Name@146) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('io': Name@146) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('jvm': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('jvm': Name@147) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('reflect': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('reflect': Name@148) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    functions('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@137
-    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@137
-    membersProtos = LinkedHashMap@150 // through DeserializedPackageMemberScope@142
-    properties('A': Name@112) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    properties('B': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    properties('C': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    properties('io': Name@146) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    properties('jvm': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    properties('reflect': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
-    properties('x': Name@123) = EmptyList@13[empty] // through DeserializedPackageMemberScope@142
+LazyJavaPackageFragment@82['kotlin'] {
+    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Any': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('CharSequence': Name@139) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Int': Name@118) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('Number': Name@120) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('String': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('io': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('jvm': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('reflect': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@138
+    deserializedPackageScope = DeserializedPackageMemberScope@143 // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('get': Name@16) = ArrayList@144[2] { DeserializedSimpleFunctionDescriptor@145['get'], DeserializedSimpleFunctionDescriptor@146['get'] } // through DeserializedPackageMemberScope@143
+    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('invoke': Name@122) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('io': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('io': Name@147) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('jvm': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('jvm': Name@148) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('reflect': Name@149) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('reflect': Name@149) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    functions('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@138
+    memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@138
+    membersProtos = LinkedHashMap@151 // through DeserializedPackageMemberScope@143
+    properties('A': Name@113) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    properties('B': Name@116) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    properties('C': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    properties('get': Name@16) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    properties('io': Name@147) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    properties('jvm': Name@148) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    properties('reflect': Name@149) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
+    properties('x': Name@124) = EmptyList@13[empty] // through DeserializedPackageMemberScope@143
 }
 
-LazyJavaPackageFragment@71['lang'] {
-    classes('A': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('B': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('C': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('invoke': Name@121) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('x': Name@123) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('A': Name@112) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('B': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('C': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('invoke': Name@121) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('x': Name@123) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    memberIndex = computeMemberIndex$1@152 // through LazyPackageFragmentScopeForJavaPackage@151
+LazyJavaPackageFragment@72['lang'] {
+    classes('A': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('B': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('C': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('invoke': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('x': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('A': Name@113) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('B': Name@116) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('C': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('get': Name@16) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('invoke': Name@122) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('x': Name@124) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    memberIndex = computeMemberIndex$1@153 // through LazyPackageFragmentScopeForJavaPackage@152
 }
 
 LazyJavaPackageFragment@11['reflect'] {
-    classes('KCallable': Name@153) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('KMemberProperty': Name@155) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@154
-    classes('KProperty': Name@156) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@154
-    deserializedPackageScope = Empty@124 // through LazyPackageFragmentScopeForJavaPackage@154
-    functions('KMemberProperty': Name@157) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@154
-    memberIndex = computeMemberIndex$1@158 // through LazyPackageFragmentScopeForJavaPackage@154
+    classes('KCallable': Name@154) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('KMemberProperty': Name@156) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@155
+    classes('KProperty': Name@157) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@155
+    deserializedPackageScope = Empty@125 // through LazyPackageFragmentScopeForJavaPackage@155
+    functions('KMemberProperty': Name@158) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@155
+    memberIndex = computeMemberIndex$1@159 // through LazyPackageFragmentScopeForJavaPackage@155
 }
 
-NestedClassDescriptors@159 {
+NestedClassDescriptors@160 {
     findNestedClass('get': Name@12) = null
 }
 
-TypeDeserializer@160 {
-    classDescriptors('20': Integer@161) = DeserializedClassDescriptor@162['Int']
-    classDescriptors('59': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
+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> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@165 {
-    classDescriptors('20': Integer@161) = DeserializedClassDescriptor@162['Int']
-    classDescriptors('59': Integer@163) = DeserializedClassDescriptor@164['CharSequence']
+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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@166 {
-    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@168['Any']
-    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@6['KProperty']
+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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@170 {
-    classDescriptors('3': Integer@167) = DeserializedClassDescriptor@168['Any']
+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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-TypeDeserializer@171 {
-    classDescriptors('4': Integer@169) = DeserializedClassDescriptor@2['KCallable']
+ResolutionTaskHolder@181 {
+    <name not found> = ArrayList@182[1] { ResolutionCandidate@183 }
+    <name not found> = ArrayList@184[1] { ResolutionCandidate@183 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+}
+
+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@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[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[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[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@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@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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@285 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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 e1a13c170bd..e65cd8ee246 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/accessViaSubclass.lazy.log
@@ -12,7 +12,6 @@ DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@9['reflect']
     functions('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@12
     membersProtos = LinkedHashMap@13 // through DeserializedClassMemberScope@12
-    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@12
 }
 
 DeserializedClassDescriptor@4['KMemberProperty'] {
@@ -20,7 +19,6 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
     defaultType = JetTypeImpl@14['KMemberProperty<2>']
     functions('get': Name@10) = ArrayList@15[1] { DeserializedSimpleFunctionDescriptor@16['get'] } // through DeserializedClassMemberScope@17
     membersProtos = LinkedHashMap@18 // through DeserializedClassMemberScope@17
-    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@17
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@19['<this>']
 }
 
@@ -28,7 +26,6 @@ DeserializedClassDescriptor@6['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@9['reflect']
     functions('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@20
     membersProtos = LinkedHashMap@21 // through DeserializedClassMemberScope@20
-    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedClassMemberScope@20
 }
 
 DeserializedTypeParameterDescriptor@22['R'] {
@@ -64,12 +61,12 @@ DeserializedType@38['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@40
 }
 
-DeserializedType@26['kotlin.Any'] {
+DeserializedType@35['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@39
     memberScope = DeserializedClassMemberScope@40
 }
 
-DeserializedType@35['kotlin.Any'] {
+DeserializedType@26['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@39
     memberScope = DeserializedClassMemberScope@40
 }
@@ -120,13 +117,11 @@ LazyJavaPackageFragment@50['<root>'] {
     classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('KMemberProperty': Name@82) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@80
     classes('kotlin': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@80
     deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@80
     functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     functions('kotlin': Name@87) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@80
     memberIndex = computeMemberIndex$1@88 // through LazyPackageFragmentScopeForJavaPackage@80
@@ -136,22 +131,18 @@ LazyJavaPackageFragment@68['io'] {
     classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@89
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@89
     classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@89
     deserializedPackageScope = DeserializedPackageMemberScope@90 // through LazyPackageFragmentScopeForJavaPackage@89
     functions('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
     functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     functions('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
     functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
-    functions('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
-    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     functions('invoke': Name@84) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
     functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@89
     memberIndex = computeMemberIndex$1@91 // through LazyPackageFragmentScopeForJavaPackage@89
     membersProtos = LinkedHashMap@92 // through DeserializedPackageMemberScope@90
     properties('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
     properties('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
-    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@90
 }
 
 LazyJavaPackageFragment@56['java'] {
@@ -165,12 +156,10 @@ LazyJavaPackageFragment@73['jvm'] {
     classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@97
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@97
     classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@97
     deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@97
     functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
-    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@97
     memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@97
 }
@@ -180,7 +169,6 @@ LazyJavaPackageFragment@63['kotlin'] {
     classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('Int': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('io': Name@101) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('jvm': Name@102) = null // through LazyPackageFragmentScopeForJavaPackage@100
@@ -190,61 +178,208 @@ LazyJavaPackageFragment@63['kotlin'] {
     functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     functions('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
     functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('get': Name@10) = ArrayList@105[2] { DeserializedSimpleFunctionDescriptor@106['get'], DeserializedSimpleFunctionDescriptor@107['get'] } // through DeserializedPackageMemberScope@104
-    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     functions('invoke': Name@84) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
     functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('io': Name@108) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('io': Name@108) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('jvm': Name@109) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('jvm': Name@109) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('reflect': Name@110) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    functions('reflect': Name@110) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
-    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@100
-    membersProtos = LinkedHashMap@112 // through DeserializedPackageMemberScope@104
+    functions('io': Name@105) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('io': Name@105) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('jvm': Name@106) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('jvm': Name@106) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    functions('reflect': Name@107) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    functions('reflect': Name@107) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@100
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@100
+    membersProtos = LinkedHashMap@109 // through DeserializedPackageMemberScope@104
     properties('Derived': Name@79) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
     properties('foo': Name@83) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('get': Name@10) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('io': Name@108) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('jvm': Name@109) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
-    properties('reflect': Name@110) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('io': Name@105) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('jvm': Name@106) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
+    properties('reflect': Name@107) = EmptyList@11[empty] // through DeserializedPackageMemberScope@104
 }
 
 LazyJavaPackageFragment@58['lang'] {
-    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('get': Name@10) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@113
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('get': Name@10) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
-    memberIndex = computeMemberIndex$1@114 // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('Derived': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@83) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('invoke': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('Derived': Name@79) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@83) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('invoke': Name@84) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@111 // through LazyPackageFragmentScopeForJavaPackage@110
 }
 
 LazyJavaPackageFragment@9['reflect'] {
-    classes('KCallable': Name@115) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('KMemberProperty': Name@117) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@116
-    classes('KProperty': Name@118) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@116
-    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@116
-    functions('KMemberProperty': Name@119) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@116
-    memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@116
+    classes('KCallable': Name@112) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('KMemberProperty': Name@114) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@113
+    classes('KProperty': Name@115) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@113
+    deserializedPackageScope = Empty@86 // through LazyPackageFragmentScopeForJavaPackage@113
+    functions('KMemberProperty': Name@116) = EmptyList@11[empty] // through LazyPackageFragmentScopeForJavaPackage@113
+    memberIndex = computeMemberIndex$1@117 // through LazyPackageFragmentScopeForJavaPackage@113
 }
 
-NestedClassDescriptors@121 {
+NestedClassDescriptors@118 {
     findNestedClass('get': Name@10) = null
 }
 
-TypeDeserializer@122 {
-    classDescriptors('3': Integer@123) = DeserializedClassDescriptor@124['Any']
-    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@6['KProperty']
+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]
+    <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]
 }
 
-TypeDeserializer@126 {
-    classDescriptors('3': Integer@123) = DeserializedClassDescriptor@124['Any']
+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]
 }
 
-TypeDeserializer@127 {
-    classDescriptors('4': Integer@125) = DeserializedClassDescriptor@2['KCallable']
+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> = 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]
+}
+
+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]
+    <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@149 {
+    <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@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]
+}
+
+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@152 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@154['Any']
+    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@6['KProperty']
+}
+
+TypeDeserializer@156 {
+    classDescriptors('3': Integer@153) = DeserializedClassDescriptor@154['Any']
+}
+
+TypeDeserializer@157 {
+    classDescriptors('4': Integer@155) = DeserializedClassDescriptor@2['KCallable']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
index 2d27db9683d..8b4c5eb1709 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/classFromClass.lazy.log
@@ -40,6 +40,11 @@ DeserializedType@19['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@25
 }
 
+DeserializedType@23['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@24
+    memberScope = DeserializedClassMemberScope@25
+}
+
 DeserializedType@11['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@24
     memberScope = DeserializedClassMemberScope@25
@@ -50,11 +55,6 @@ DeserializedType@15['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@25
 }
 
-DeserializedType@23['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@24
-    memberScope = DeserializedClassMemberScope@25
-}
-
 LazyJavaPackageFragmentProvider@26 {
     packageFragments('<root>': FqName@27) = LazyJavaPackageFragment@28['<root>']
     packageFragments('A': FqName@29) = null
@@ -198,10 +198,426 @@ LazyJavaPackageFragment@7['reflect'] {
     memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
 }
 
-TypeDeserializer@101 {
-    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@103['Any']
+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@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]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <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@104 {
-    classDescriptors('3': Integer@102) = DeserializedClassDescriptor@103['Any']
+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 }
+    <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> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <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@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]
+}
+
+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]
+}
+
+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]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <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 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@139 {
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <name not found> = EmptyList@73[empty]
+    <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@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 f23ee7f76c7..d1c3c858fa8 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromClass.lazy.log
@@ -78,11 +78,11 @@ DeserializedTypeParameterDescriptor@40['T'] {
 }
 
 DeserializedType@42['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@29
+    constructor = AbstractLazyTypeParameterDescriptor$1@27
 }
 
 DeserializedType@43['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@27
+    constructor = AbstractLazyTypeParameterDescriptor$1@29
 }
 
 DeserializedType@44['T in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
@@ -93,7 +93,7 @@ DeserializedType@45['T in kotlin.reflect.KTopLevelExtensionProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@39
 }
 
-DeserializedType@33['kotlin.Any'] {
+DeserializedType@37['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@46
     memberScope = DeserializedClassMemberScope@47
 }
@@ -103,12 +103,12 @@ DeserializedType@25['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@47
 }
 
-DeserializedType@37['kotlin.Any'] {
+DeserializedType@21['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@46
     memberScope = DeserializedClassMemberScope@47
 }
 
-DeserializedType@21['kotlin.Any'] {
+DeserializedType@33['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@46
     memberScope = DeserializedClassMemberScope@47
 }
@@ -313,34 +313,274 @@ LazyJavaPackageFragment@17['reflect'] {
     memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@148
 }
 
-TypeDeserializer@156 {
-    classDescriptors('3': Integer@157) = DeserializedClassDescriptor@158['Any']
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@12['KProperty']
+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]
+    <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]
 }
 
-TypeDeserializer@160 {
-    classDescriptors('3': Integer@157) = DeserializedClassDescriptor@158['Any']
+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]
+    <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]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
+    <name not found> = EmptyList@122[empty]
 }
 
-TypeDeserializer@161 {
-    classDescriptors('3': Integer@157) = DeserializedClassDescriptor@158['Any']
+ResolutionTaskHolder@164 {
+    <name not found> = ArrayList@165[1] { ResolutionCandidate@166 }
+    <name not found> = ArrayList@167[1] { ResolutionCandidate@166 }
+    <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]
 }
 
-TypeDeserializer@162 {
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@2['KCallable']
+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]
 }
 
-TypeDeserializer@163 {
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@164) = DeserializedClassDescriptor@16['KTopLevelProperty']
+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]
+    <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]
 }
 
-TypeDeserializer@165 {
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@12['KProperty']
+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]
+    <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]
 }
 
-TypeDeserializer@166 {
-    classDescriptors('4': Integer@159) = DeserializedClassDescriptor@14['KTopLevelExtensionProperty']
-    classDescriptors('5': Integer@164) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classDescriptors('6': Integer@167) = DeserializedClassDescriptor@10['KMutableTopLevelProperty']
+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]
+    <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]
+}
+
+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]
+    <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]
+}
+
+TypeDeserializer@176 {
+    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@178['Any']
+    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@12['KProperty']
+}
+
+TypeDeserializer@180 {
+    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@178['Any']
+}
+
+TypeDeserializer@181 {
+    classDescriptors('3': Integer@177) = DeserializedClassDescriptor@178['Any']
+}
+
+TypeDeserializer@182 {
+    classDescriptors('4': Integer@179) = DeserializedClassDescriptor@2['KCallable']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
index 069dbf67fc8..e5887ed8a04 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionFromTopLevel.lazy.log
@@ -16,7 +16,6 @@ DeserializedClassDescriptor@2['KCallable'] {
     functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
     membersProtos = LinkedHashMap@26 // through DeserializedClassMemberScope@24
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@24
 }
 
@@ -26,7 +25,6 @@ DeserializedClassDescriptor@4['KExtensionProperty'] {
     functions('get': Name@22) = ArrayList@28[1] { DeserializedSimpleFunctionDescriptor@29['get'] } // through DeserializedClassMemberScope@30
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
     membersProtos = LinkedHashMap@31 // through DeserializedClassMemberScope@30
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@30
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
 }
@@ -37,8 +35,6 @@ DeserializedClassDescriptor@6['KMutableExtensionProperty'] {
     functions('get': Name@34) = ArrayList@35[1] { DeserializedSimpleFunctionDescriptor@36['get'] } // through DeserializedClassMemberScope@37
     functions('set': Name@38) = ArrayList@39[1] { DeserializedSimpleFunctionDescriptor@40['set'] } // through DeserializedClassMemberScope@37
     membersProtos = LinkedHashMap@41 // through DeserializedClassMemberScope@37
-    properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@37
-    properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@37
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@42['<this>']
 }
 
@@ -47,8 +43,6 @@ DeserializedClassDescriptor@8['KMutableProperty'] {
     functions('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
     functions('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
     membersProtos = LinkedHashMap@44 // through DeserializedClassMemberScope@43
-    properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
-    properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@43
 }
 
 DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] {
@@ -56,8 +50,6 @@ DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] {
     functions('get': Name@34) = ArrayList@45[1] { DeserializedSimpleFunctionDescriptor@46['get'] } // through DeserializedClassMemberScope@47
     functions('set': Name@38) = ArrayList@48[1] { DeserializedSimpleFunctionDescriptor@49['set'] } // through DeserializedClassMemberScope@47
     membersProtos = LinkedHashMap@50 // through DeserializedClassMemberScope@47
-    properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@47
-    properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@47
 }
 
 DeserializedClassDescriptor@12['KMutableTopLevelProperty'] {
@@ -65,8 +57,6 @@ DeserializedClassDescriptor@12['KMutableTopLevelProperty'] {
     functions('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
     functions('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
     membersProtos = LinkedHashMap@52 // through DeserializedClassMemberScope@51
-    properties('get': Name@34) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
-    properties('set': Name@38) = EmptyList@23[empty] // through DeserializedClassMemberScope@51
 }
 
 DeserializedClassDescriptor@14['KProperty'] {
@@ -74,7 +64,6 @@ DeserializedClassDescriptor@14['KProperty'] {
     functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
     membersProtos = LinkedHashMap@54 // through DeserializedClassMemberScope@53
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@53
 }
 
@@ -84,7 +73,6 @@ DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] {
     functions('get': Name@22) = ArrayList@56[1] { DeserializedSimpleFunctionDescriptor@57['get'] } // through DeserializedClassMemberScope@58
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
     membersProtos = LinkedHashMap@59 // through DeserializedClassMemberScope@58
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@58
 }
 
@@ -93,7 +81,6 @@ DeserializedClassDescriptor@18['KTopLevelProperty'] {
     functions('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
     functions('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
     membersProtos = LinkedHashMap@61 // through DeserializedClassMemberScope@60
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedClassMemberScope@60
 }
 
@@ -186,7 +173,7 @@ DeserializedType@120['K in kotlin'] {
 }
 
 DeserializedType@121['R in kotlin.reflect.KExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@122['R in kotlin.reflect.KMutableExtensionProperty'] {
@@ -210,11 +197,11 @@ DeserializedType@126['R in kotlin.reflect.KMutableTopLevelExtensionProperty'] {
 }
 
 DeserializedType@127['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 DeserializedType@128['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@74
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
 DeserializedType@129['T in kotlin.reflect.KExtensionProperty'] {
@@ -253,42 +240,12 @@ DeserializedType@137['V in kotlin'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@116
 }
 
-DeserializedType@71['kotlin.Any'] {
+DeserializedType@76['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@114['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@66['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@100['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@140['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@118['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@81['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@138
-    memberScope = DeserializedClassMemberScope@139
-}
-
-DeserializedType@85['kotlin.Any'] {
+DeserializedType@110['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -298,12 +255,42 @@ DeserializedType@105['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@76['kotlin.Any'] {
+DeserializedType@100['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
 
-DeserializedType@110['kotlin.Any'] {
+DeserializedType@66['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@140['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@81['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@138
+    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'] {
+    constructor = DeserializedClassTypeConstructor@138
+    memberScope = DeserializedClassMemberScope@139
+}
+
+DeserializedType@85['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@138
     memberScope = DeserializedClassMemberScope@139
 }
@@ -384,13 +371,13 @@ DeserializedType@179['kotlin.reflect.KTopLevelProperty'] {
 }
 
 EnumEntryClassDescriptors@181 {
-    findEnumEntry('get': Name@22) = null
-    findEnumEntry('set': Name@25) = null
+    findEnumEntry('get': Name@34) = null
+    findEnumEntry('set': Name@38) = null
 }
 
 EnumEntryClassDescriptors@182 {
-    findEnumEntry('get': Name@34) = null
-    findEnumEntry('set': Name@38) = null
+    findEnumEntry('get': Name@22) = null
+    findEnumEntry('set': Name@25) = null
 }
 
 LazyJavaPackageFragmentProvider@183 {
@@ -456,7 +443,6 @@ LazyJavaPackageFragment@185['<root>'] {
     classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@241
     classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@241
     classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@241
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@241
     classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@241
     classes('kotlin': Name@250) = null // through LazyPackageFragmentScopeForJavaPackage@241
     classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@241
@@ -464,7 +450,6 @@ LazyJavaPackageFragment@185['<root>'] {
     classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@241
     deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@241
     functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
-    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
     functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
     functions('kotlin': Name@254) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
     functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@241
@@ -477,7 +462,6 @@ LazyJavaPackageFragment@214['io'] {
     classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@256
     classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@256
     classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@256
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@256
     classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@256
     classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@256
     classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@256
@@ -485,8 +469,6 @@ LazyJavaPackageFragment@214['io'] {
     deserializedPackageScope = DeserializedPackageMemberScope@257 // through LazyPackageFragmentScopeForJavaPackage@256
     functions('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
     functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
-    functions('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
     functions('invoke': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
     functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@256
     functions('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
@@ -496,7 +478,6 @@ LazyJavaPackageFragment@214['io'] {
     memberIndex = computeMemberIndex$1@258 // through LazyPackageFragmentScopeForJavaPackage@256
     membersProtos = LinkedHashMap@259 // through DeserializedPackageMemberScope@257
     properties('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
     properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
     properties('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@257
@@ -514,14 +495,12 @@ LazyJavaPackageFragment@223['jvm'] {
     classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@264
     classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@264
     classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@264
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@264
     classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@264
     classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@264
     classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@264
     classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@264
     deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@264
     functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
-    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
     functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
     functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
     functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@264
@@ -536,7 +515,6 @@ LazyJavaPackageFragment@62['kotlin'] {
     classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@267
     classes('Unit': Name@269) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@267
     classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@267
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@267
     classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@267
     classes('io': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@267
     classes('jvm': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@267
@@ -547,136 +525,505 @@ LazyJavaPackageFragment@62['kotlin'] {
     deserializedPackageScope = DeserializedPackageMemberScope@273 // through LazyPackageFragmentScopeForJavaPackage@267
     functions('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
     functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('get': Name@22) = ArrayList@274[2] { DeserializedSimpleFunctionDescriptor@275['get'], DeserializedSimpleFunctionDescriptor@276['get'] } // through DeserializedPackageMemberScope@273
-    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
     functions('invoke': Name@249) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
     functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('io': Name@277) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('io': Name@277) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('jvm': Name@278) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('jvm': Name@278) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('io': Name@274) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('io': Name@274) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('jvm': Name@275) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('jvm': Name@275) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
     functions('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
     functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('reflect': Name@279) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    functions('reflect': Name@279) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    functions('set': Name@25) = ArrayList@280[1] { DeserializedSimpleFunctionDescriptor@281['set'] } // through DeserializedPackageMemberScope@273
+    functions('reflect': Name@276) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    functions('reflect': Name@276) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
+    functions('set': Name@25) = ArrayList@277[1] { DeserializedSimpleFunctionDescriptor@278['set'] } // through DeserializedPackageMemberScope@273
     functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@267
-    memberIndex = computeMemberIndex$1@282 // through LazyPackageFragmentScopeForJavaPackage@267
-    membersProtos = LinkedHashMap@283 // through DeserializedPackageMemberScope@273
+    memberIndex = computeMemberIndex$1@279 // through LazyPackageFragmentScopeForJavaPackage@267
+    membersProtos = LinkedHashMap@280 // through DeserializedPackageMemberScope@273
     properties('countCharacters': Name@248) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('get': Name@22) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('io': Name@277) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('jvm': Name@278) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('io': Name@274) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('jvm': Name@275) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
     properties('length': Name@251) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
     properties('meaning': Name@252) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
-    properties('reflect': Name@279) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
+    properties('reflect': Name@276) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
     properties('set': Name@25) = EmptyList@23[empty] // through DeserializedPackageMemberScope@273
 }
 
 LazyJavaPackageFragment@197['lang'] {
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@284
-    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@284
-    memberIndex = computeMemberIndex$1@285 // through LazyPackageFragmentScopeForJavaPackage@284
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@281
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@281
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@281
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@281
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@281
+    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@281
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@281
+    memberIndex = computeMemberIndex$1@282 // through LazyPackageFragmentScopeForJavaPackage@281
 }
 
 LazyJavaPackageFragment@21['reflect'] {
-    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KCallable': Name@287) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KExtensionProperty': Name@242) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KMutableExtensionProperty': Name@243) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KMutableProperty': Name@288) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KMutableTopLevelExtensionProperty': Name@289) = DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KMutableTopLevelProperty': Name@290) = DeserializedClassDescriptor@12['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KProperty': Name@291) = DeserializedClassDescriptor@14['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KTopLevelExtensionProperty': Name@292) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('KTopLevelProperty': Name@293) = DeserializedClassDescriptor@18['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('get': Name@22) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@286
-    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@286
-    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
-    functions('get': Name@22) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
-    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
-    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
-    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@286
-    memberIndex = computeMemberIndex$1@294 // through LazyPackageFragmentScopeForJavaPackage@286
+    classes('Int': Name@240) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KCallable': Name@284) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KExtensionProperty': Name@242) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KMutableExtensionProperty': Name@243) = DeserializedClassDescriptor@6['KMutableExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KMutableProperty': Name@285) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KMutableTopLevelExtensionProperty': Name@286) = DeserializedClassDescriptor@10['KMutableTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KMutableTopLevelProperty': Name@287) = DeserializedClassDescriptor@12['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KProperty': Name@288) = DeserializedClassDescriptor@14['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KTopLevelExtensionProperty': Name@289) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('KTopLevelProperty': Name@290) = DeserializedClassDescriptor@18['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('Long': Name@246) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('String': Name@247) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('countCharacters': Name@248) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('invoke': Name@249) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('length': Name@251) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('meaning': Name@252) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    classes('set': Name@25) = null // through LazyPackageFragmentScopeForJavaPackage@283
+    deserializedPackageScope = Empty@253 // through LazyPackageFragmentScopeForJavaPackage@283
+    functions('countCharacters': Name@248) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
+    functions('invoke': Name@249) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
+    functions('meaning': Name@252) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
+    functions('set': Name@25) = EmptyList@23[empty] // through LazyPackageFragmentScopeForJavaPackage@283
+    memberIndex = computeMemberIndex$1@291 // through LazyPackageFragmentScopeForJavaPackage@283
 }
 
-NestedClassDescriptors@295 {
+NestedClassDescriptors@292 {
     findNestedClass('get': Name@34) = null
     findNestedClass('set': Name@38) = null
 }
 
-NestedClassDescriptors@296 {
+NestedClassDescriptors@293 {
     findNestedClass('get': Name@22) = null
     findNestedClass('set': Name@25) = null
 }
 
-TypeDeserializer@297 {
-    classDescriptors('102': Integer@298) = DeserializedClassDescriptor@299['MutableMap']
-    classDescriptors('2': Integer@300) = DeserializedClassDescriptor@301['Any']
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@302 {
-    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@8['KMutableProperty']
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@306 {
-    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@18['KTopLevelProperty']
+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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@307 {
-    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@14['KProperty']
+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]
 }
 
-TypeDeserializer@308 {
-    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@16['KTopLevelExtensionProperty']
-    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@6['KMutableExtensionProperty']
-    classDescriptors('6': Integer@309) = DeserializedClassDescriptor@12['KMutableTopLevelProperty']
+ResolutionTaskHolder@310 {
+    <name not found> = ArrayList@311[1] { ResolutionCandidate@312 }
+    <name not found> = ArrayList@313[1] { ResolutionCandidate@312 }
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
 }
 
-TypeDeserializer@310 {
-    classDescriptors('3': Integer@303) = DeserializedClassDescriptor@301['Any']
+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]
 }
 
-TypeDeserializer@311 {
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@2['KCallable']
+ResolutionTaskHolder@318 {
+    <name not found> = ArrayList@319[1] { ResolutionCandidate@320 }
+    <name not found> = ArrayList@321[1] { ResolutionCandidate@320 }
 }
 
-TypeDeserializer@312 {
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@14['KProperty']
+ResolutionTaskHolder@322 {
+    <name not found> = ArrayList@323[1] { ResolutionCandidate@324 }
+    <name not found> = ArrayList@325[1] { ResolutionCandidate@324 }
 }
 
-TypeDeserializer@313 {
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@14['KProperty']
+ResolutionTaskHolder@326 {
+    <name not found> = ArrayList@327[1] { ResolutionCandidate@328 }
+    <name not found> = ArrayList@329[1] { ResolutionCandidate@328 }
 }
 
-TypeDeserializer@314 {
-    classDescriptors('4': Integer@304) = DeserializedClassDescriptor@18['KTopLevelProperty']
-    classDescriptors('5': Integer@305) = DeserializedClassDescriptor@8['KMutableProperty']
+ResolutionTaskHolder@330 {
+    <name not found> = ArrayList@331[1] { ResolutionCandidate@332 }
+    <name not found> = ArrayList@333[1] { ResolutionCandidate@332 }
 }
 
-TypeDeserializer@315 {
-    classDescriptors('6': Integer@309) = DeserializedClassDescriptor@20['Unit']
+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[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@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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <name not found> = EmptyList@23[empty]
+    <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@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]
+    <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]
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@384 {
+    <name not found> = EmptyList@23[empty]
+    <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 3a6c30b6c49..6bfcbec161e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/extensionPropertyOnNullable.lazy.log
@@ -10,7 +10,6 @@ DeserializedClassDescriptor@2['KCallable'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
     membersProtos = LinkedHashMap@15 // through DeserializedClassMemberScope@14
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@14
 }
 
 DeserializedClassDescriptor@4['KExtensionProperty'] {
@@ -18,7 +17,6 @@ DeserializedClassDescriptor@4['KExtensionProperty'] {
     defaultType = JetTypeImpl@16['KExtensionProperty<2>']
     functions('get': Name@12) = ArrayList@17[1] { DeserializedSimpleFunctionDescriptor@18['get'] } // through DeserializedClassMemberScope@19
     membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@19
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@19
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@21['<this>']
 }
 
@@ -26,21 +24,18 @@ DeserializedClassDescriptor@6['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
     membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@22
 }
 
 DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = ArrayList@24[1] { DeserializedSimpleFunctionDescriptor@25['get'] } // through DeserializedClassMemberScope@26
     membersProtos = LinkedHashMap@27 // through DeserializedClassMemberScope@26
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@26
 }
 
 DeserializedClassDescriptor@10['KTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@11['reflect']
     functions('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@28
     membersProtos = LinkedHashMap@29 // through DeserializedClassMemberScope@28
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedClassMemberScope@28
 }
 
 DeserializedTypeParameterDescriptor@30['R'] {
@@ -78,7 +73,7 @@ DeserializedType@46['R in kotlin.reflect.KExtensionProperty'] {
 }
 
 DeserializedType@47['R in kotlin.reflect.KTopLevelExtensionProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@36
+    constructor = AbstractLazyTypeParameterDescriptor$1@34
 }
 
 DeserializedType@48['T in kotlin.reflect.KExtensionProperty'] {
@@ -147,11 +142,9 @@ LazyJavaPackageFragmentProvider@68 {
 LazyJavaPackageFragment@70['<root>'] {
     classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@94
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@94
     classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@94
     deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@94
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@94
     memberIndex = computeMemberIndex$1@99 // through LazyPackageFragmentScopeForJavaPackage@94
@@ -160,19 +153,15 @@ LazyJavaPackageFragment@70['<root>'] {
 LazyJavaPackageFragment@84['io'] {
     classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@100
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@100
     classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@100
     deserializedPackageScope = DeserializedPackageMemberScope@101 // through LazyPackageFragmentScopeForJavaPackage@100
-    functions('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     functions('invoke': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
     functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     functions('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
     functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@100
     memberIndex = computeMemberIndex$1@102 // through LazyPackageFragmentScopeForJavaPackage@100
     membersProtos = LinkedHashMap@103 // through DeserializedPackageMemberScope@101
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
     properties('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@101
 }
 
@@ -186,11 +175,9 @@ LazyJavaPackageFragment@74['java'] {
 LazyJavaPackageFragment@88['jvm'] {
     classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@108
     classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@108
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@108
     classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@108
     classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@108
     deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@108
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
     functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
     functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@108
     memberIndex = computeMemberIndex$1@109 // through LazyPackageFragmentScopeForJavaPackage@108
@@ -199,70 +186,217 @@ LazyJavaPackageFragment@88['jvm'] {
 LazyJavaPackageFragment@80['kotlin'] {
     classes('Any': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
     classes('Int': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@110
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@110
     classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@110
     classes('io': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@110
     classes('jvm': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@110
     classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@110
     deserializedPackageScope = DeserializedPackageMemberScope@113 // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('get': Name@12) = ArrayList@114[2] { DeserializedSimpleFunctionDescriptor@115['get'], DeserializedSimpleFunctionDescriptor@116['get'] } // through DeserializedPackageMemberScope@113
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
     functions('invoke': Name@96) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
     functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('io': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    functions('io': Name@117) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    functions('jvm': Name@118) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    functions('jvm': Name@118) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    functions('io': Name@114) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    functions('jvm': Name@115) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
     functions('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
     functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@110
-    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@110
-    membersProtos = LinkedHashMap@120 // through DeserializedPackageMemberScope@113
-    properties('get': Name@12) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    properties('io': Name@117) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
-    properties('jvm': Name@118) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    memberIndex = computeMemberIndex$1@116 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@117 // through DeserializedPackageMemberScope@113
+    properties('io': Name@114) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
+    properties('jvm': Name@115) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
     properties('meaning': Name@97) = EmptyList@13[empty] // through DeserializedPackageMemberScope@113
 }
 
 LazyJavaPackageFragment@76['lang'] {
-    classes('get': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('get': Name@12) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    memberIndex = computeMemberIndex$1@122 // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('invoke': Name@96) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    classes('meaning': Name@97) = null // through LazyPackageFragmentScopeForJavaPackage@118
+    deserializedPackageScope = Empty@98 // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('invoke': Name@96) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    functions('meaning': Name@97) = EmptyList@13[empty] // through LazyPackageFragmentScopeForJavaPackage@118
+    memberIndex = computeMemberIndex$1@119 // through LazyPackageFragmentScopeForJavaPackage@118
 }
 
 LazyJavaPackageFragment@11['reflect'] {
-    classes('KCallable': Name@123) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KExtensionProperty': Name@125) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KProperty': Name@126) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KTopLevelExtensionProperty': Name@127) = DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('KTopLevelProperty': Name@128) = DeserializedClassDescriptor@10['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('KCallable': Name@120) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('KExtensionProperty': Name@122) = DeserializedClassDescriptor@4['KExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('KProperty': Name@123) = DeserializedClassDescriptor@6['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('KTopLevelExtensionProperty': Name@124) = DeserializedClassDescriptor@8['KTopLevelExtensionProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
+    classes('KTopLevelProperty': Name@125) = DeserializedClassDescriptor@10['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@121
 }
 
-NestedClassDescriptors@129 {
+NestedClassDescriptors@126 {
     findNestedClass('get': Name@12) = null
 }
 
-TypeDeserializer@130 {
-    classDescriptors('3': Integer@131) = DeserializedClassDescriptor@132['Any']
+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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@133 {
-    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@2['KCallable']
+ResolutionTaskHolder@131 {
+    <name not found> = ArrayList@132[1] { ResolutionCandidate@133 }
+    <name not found> = ArrayList@134[1] { ResolutionCandidate@133 }
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
 }
 
-TypeDeserializer@135 {
-    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@4['KExtensionProperty']
-    classDescriptors('5': Integer@136) = DeserializedClassDescriptor@10['KTopLevelProperty']
+ResolutionTaskHolder@135 {
+    <name not found> = ArrayList@136[1] { ResolutionCandidate@137 }
+    <name not found> = ArrayList@138[1] { ResolutionCandidate@137 }
 }
 
-TypeDeserializer@137 {
-    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@6['KProperty']
+ResolutionTaskHolder@139 {
+    <name not found> = ArrayList@140[1] { ResolutionCandidate@141 }
+    <name not found> = ArrayList@142[1] { ResolutionCandidate@141 }
 }
 
-TypeDeserializer@138 {
-    classDescriptors('4': Integer@134) = DeserializedClassDescriptor@6['KProperty']
+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> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@153 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@154 {
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <name not found> = EmptyList@13[empty]
+    <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@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]
+    <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 {
+    <name not found> = EmptyList@13[empty]
+    <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 ee86c582f7e..37130ba55ff 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/genericClass.lazy.log
@@ -16,12 +16,12 @@ DeserializedTypeParameterDescriptor@8['T'] {
     upperBounds = LinkedHashSet@10[1] { DeserializedType@11['kotlin.Any'] }
 }
 
-DeserializedType@7['kotlin.Any'] {
+DeserializedType@11['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@12
     memberScope = DeserializedClassMemberScope@13
 }
 
-DeserializedType@11['kotlin.Any'] {
+DeserializedType@7['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@12
     memberScope = DeserializedClassMemberScope@13
 }
@@ -159,6 +159,274 @@ LazyJavaPackageFragment@3['reflect'] {
     memberIndex = computeMemberIndex$1@92 // through LazyPackageFragmentScopeForJavaPackage@90
 }
 
-TypeDeserializer@93 {
-    classDescriptors('3': Integer@94) = DeserializedClassDescriptor@95['Any']
+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]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@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]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@101 {
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@103 }
+    <name not found> = ArrayList@104[1] { ResolutionCandidate@103 }
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[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@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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]
+}
+
+ResolutionTaskHolder@128 {
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <name not found> = EmptyList@63[empty]
+    <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@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 39f6d2b31a7..46443481d4e 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@17['kotlin.Any'] {
+DeserializedType@9['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
 
-DeserializedType@9['kotlin.Any'] {
+DeserializedType@17['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@22
     memberScope = DeserializedClassMemberScope@23
 }
@@ -394,10 +394,774 @@ LazyJavaPackageFragment@5['reflect'] {
     memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@191
 }
 
-TypeDeserializer@193 {
-    classDescriptors('3': Integer@194) = DeserializedClassDescriptor@195['Any']
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@196 {
-    classDescriptors('3': Integer@194) = DeserializedClassDescriptor@195['Any']
+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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@201 {
+    <name not found> = ArrayList@202[1] { ResolutionCandidate@203 }
+    <name not found> = ArrayList@204[1] { ResolutionCandidate@203 }
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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@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@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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]
+}
+
+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]
+}
+
+ResolutionTaskHolder@261 {
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <name not found> = EmptyList@29[empty]
+    <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@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 d1b17da2ae6..fa1f38b931e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/javaStaticFieldViaImport.lazy.log
@@ -83,11 +83,11 @@ DeserializedTypeParameterDescriptor@42['R'] {
 }
 
 DeserializedType@44['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
+    constructor = AbstractLazyTypeParameterDescriptor$1@39
 }
 
 DeserializedType@45['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
+    constructor = AbstractLazyTypeParameterDescriptor$1@39
 }
 
 DeserializedType@46['R in kotlin.reflect.KMutableVariable'] {
@@ -95,18 +95,18 @@ DeserializedType@46['R in kotlin.reflect.KMutableVariable'] {
 }
 
 DeserializedType@47['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedType@48['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@39
-}
-
-DeserializedType@49['R in kotlin.reflect.KVariable'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
-DeserializedType@35['kotlin.Any'] {
+DeserializedType@48['R in kotlin.reflect.KTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@41
+}
+
+DeserializedType@49['R in kotlin.reflect.KVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@43
+}
+
+DeserializedType@23['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -116,12 +116,12 @@ DeserializedType@31['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@27['kotlin.Any'] {
+DeserializedType@35['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
 
-DeserializedType@23['kotlin.Any'] {
+DeserializedType@27['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@50
     memberScope = DeserializedClassMemberScope@51
 }
@@ -569,45 +569,315 @@ LazyJavaPackageFragment@19['reflect'] {
     memberIndex = computeMemberIndex$1@257 // through LazyPackageFragmentScopeForJavaPackage@249
 }
 
-TypeDeserializer@258 {
-    classDescriptors('3': Integer@259) = DeserializedClassDescriptor@260['Any']
-    classDescriptors('4': Integer@261) = DeserializedClassDescriptor@2['KCallable']
+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]
+    <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]
 }
 
-TypeDeserializer@262 {
-    classDescriptors('3': Integer@259) = DeserializedClassDescriptor@260['Any']
-    classDescriptors('4': Integer@261) = DeserializedClassDescriptor@12['KProperty']
+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]
+    <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]
 }
 
-TypeDeserializer@263 {
-    classDescriptors('3': Integer@259) = DeserializedClassDescriptor@260['Any']
-    classDescriptors('4': Integer@261) = DeserializedClassDescriptor@12['KProperty']
+ResolutionTaskHolder@266 {
+    <name not found> = ArrayList@267[1] { ResolutionCandidate@268 }
+    <name not found> = ArrayList@269[1] { ResolutionCandidate@268 }
+    <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]
 }
 
-TypeDeserializer@264 {
-    classDescriptors('3': Integer@259) = DeserializedClassDescriptor@260['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@265 {
-    classDescriptors('3': Integer@259) = DeserializedClassDescriptor@260['Any']
+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]
+    <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]
 }
 
-TypeDeserializer@266 {
-    classDescriptors('4': Integer@261) = DeserializedClassDescriptor@12['KProperty']
+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]
+    <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]
 }
 
-TypeDeserializer@267 {
-    classDescriptors('4': Integer@261) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classDescriptors('5': Integer@268) = DeserializedClassDescriptor@10['KMutableVariable']
-    classDescriptors('6': Integer@269) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
+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]
 }
 
-TypeDeserializer@270 {
-    classDescriptors('4': Integer@261) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@268) = DeserializedClassDescriptor@4['KMutableProperty']
+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]
+    <name not found> = EmptyList@80[empty]
 }
 
-TypeDeserializer@271 {
-    classDescriptors('4': Integer@261) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@268) = DeserializedClassDescriptor@14['KTopLevelProperty']
+ResolutionTaskHolder@290 {
+    <name not found> = ArrayList@291[1] { ResolutionCandidate@292 }
+    <name not found> = ArrayList@293[1] { ResolutionCandidate@292 }
+    <name not found> = EmptyList@80[empty]
+    <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]
+}
+
+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]
+    <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@307 {
+    <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@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]
+}
+
+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]
+}
+
+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]
+}
+
+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@312 {
+    classDescriptors('3': Integer@313) = DeserializedClassDescriptor@314['Any']
+    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@2['KCallable']
+}
+
+TypeDeserializer@316 {
+    classDescriptors('3': Integer@313) = DeserializedClassDescriptor@314['Any']
+    classDescriptors('4': Integer@315) = DeserializedClassDescriptor@12['KProperty']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
index 98142076d83..f1c5c7b74b3 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/localVariable.lazy.log
@@ -105,3 +105,97 @@ LazyJavaPackageFragment@7['lang'] {
     functions('param': Name@23) = EmptyList@25[empty] // through LazyPackageFragmentScopeForJavaPackage@45
     memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@45
 }
+
+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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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@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]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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@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]
+}
+
+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 }
+}
+
+ResolutionTaskHolder@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]
+}
+
+ResolutionTaskHolder@72 {
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <name not found> = EmptyList@25[empty]
+    <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 458fee871a9..177671f9f74 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromExtension.lazy.log
@@ -12,8 +12,6 @@ DeserializedClassDescriptor@2['KCallable'] {
     functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
     membersProtos = LinkedHashMap@18 // through DeserializedClassMemberScope@16
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@16
 }
 
 DeserializedClassDescriptor@4['KMemberProperty'] {
@@ -22,8 +20,6 @@ DeserializedClassDescriptor@4['KMemberProperty'] {
     functions('get': Name@14) = ArrayList@20[1] { DeserializedSimpleFunctionDescriptor@21['get'] } // through DeserializedClassMemberScope@22
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@22
     membersProtos = LinkedHashMap@23 // through DeserializedClassMemberScope@22
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@22
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@22
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@24['<this>']
 }
 
@@ -33,8 +29,6 @@ DeserializedClassDescriptor@6['KMutableMemberProperty'] {
     functions('get': Name@14) = ArrayList@26[1] { DeserializedSimpleFunctionDescriptor@27['get'] } // through DeserializedClassMemberScope@28
     functions('set': Name@17) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['set'] } // through DeserializedClassMemberScope@28
     membersProtos = LinkedHashMap@31 // through DeserializedClassMemberScope@28
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@28
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@28
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
 }
 
@@ -43,8 +37,6 @@ DeserializedClassDescriptor@8['KMutableProperty'] {
     functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
     membersProtos = LinkedHashMap@34 // through DeserializedClassMemberScope@33
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@33
 }
 
 DeserializedClassDescriptor@10['KProperty'] {
@@ -52,8 +44,6 @@ DeserializedClassDescriptor@10['KProperty'] {
     functions('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
     functions('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
     membersProtos = LinkedHashMap@36 // through DeserializedClassMemberScope@35
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedClassMemberScope@35
 }
 
 DeserializedClassDescriptor@12['Unit'] {
@@ -63,7 +53,6 @@ DeserializedClassDescriptor@12['Unit'] {
     functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedClassMemberScope@41
     functions('toString': Name@42) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@44['toString'] } // through DeserializedClassMemberScope@41
     membersProtos = LinkedHashMap@45 // through DeserializedClassMemberScope@41
-    properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedClassMemberScope@41
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@46['<this>']
 }
 
@@ -104,15 +93,15 @@ DeserializedTypeParameterDescriptor@68['T'] {
 }
 
 DeserializedType@73['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@49
+    constructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 DeserializedType@74['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@54
+    constructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 DeserializedType@75['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@54
+    constructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
 DeserializedType@76['T in kotlin.reflect.KMemberProperty'] {
@@ -127,7 +116,7 @@ DeserializedType@78['T in kotlin.reflect.KMutableMemberProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
-DeserializedType@56['kotlin.Any'] {
+DeserializedType@72['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@79
     memberScope = DeserializedClassMemberScope@80
 }
@@ -137,11 +126,6 @@ DeserializedType@81['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@80
 }
 
-DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@79
-    memberScope = DeserializedClassMemberScope@80
-}
-
 DeserializedType@51['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@79
     memberScope = DeserializedClassMemberScope@80
@@ -152,7 +136,12 @@ DeserializedType@82['kotlin.Any'] {
     memberScope = DeserializedClassMemberScope@80
 }
 
-DeserializedType@72['kotlin.Any'] {
+DeserializedType@56['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@79
+    memberScope = DeserializedClassMemberScope@80
+}
+
+DeserializedType@67['kotlin.Any'] {
     constructor = DeserializedClassTypeConstructor@79
     memberScope = DeserializedClassMemberScope@80
 }
@@ -253,22 +242,16 @@ LazyJavaPackageFragment@107['<root>'] {
     classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@149
     classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@149
     classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@149
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@149
     classes('kotlin': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@149
     classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@149
     deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@149
     functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     functions('kotlin': Name@159) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@149
     memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@149
 }
 
@@ -278,11 +261,8 @@ LazyJavaPackageFragment@129['io'] {
     classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@161
     classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@161
-    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@161
     deserializedPackageScope = DeserializedPackageMemberScope@162 // through LazyPackageFragmentScopeForJavaPackage@161
     functions('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
@@ -290,211 +270,688 @@ LazyJavaPackageFragment@129['io'] {
     functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     functions('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     functions('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
-    functions('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@161
     memberIndex = computeMemberIndex$1@163 // through LazyPackageFragmentScopeForJavaPackage@161
     membersProtos = LinkedHashMap@164 // through DeserializedPackageMemberScope@162
     properties('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     properties('Unit': Name@165) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     properties('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     properties('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
     properties('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('x': Name@166) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('y': Name@167) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
-    properties('z': Name@168) = EmptyList@15[empty] // through DeserializedPackageMemberScope@162
 }
 
 LazyJavaPackageFragment@114['java'] {
-    classes('lang': Name@169) = null // through LazyPackageFragmentScopeForJavaPackage@170
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@170
-    functions('lang': Name@171) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
-    memberIndex = computeMemberIndex$1@172 // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('lang': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@167
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@167
+    functions('lang': Name@168) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@167
+    memberIndex = computeMemberIndex$1@169 // through LazyPackageFragmentScopeForJavaPackage@167
 }
 
 LazyJavaPackageFragment@136['jvm'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@173
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@173
-    memberIndex = computeMemberIndex$1@174 // through LazyPackageFragmentScopeForJavaPackage@173
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@170
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@170
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@170
+    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@170
 }
 
 LazyJavaPackageFragment@38['kotlin'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Any': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('Unit': Name@153) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('io': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('jvm': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('reflect': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@175
-    deserializedPackageScope = DeserializedPackageMemberScope@180 // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('get': Name@14) = ArrayList@181[2] { DeserializedSimpleFunctionDescriptor@182['get'], DeserializedSimpleFunctionDescriptor@183['get'] } // through DeserializedPackageMemberScope@180
-    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('io': Name@184) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('io': Name@184) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('jvm': Name@185) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('jvm': Name@185) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('reflect': Name@186) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('reflect': Name@186) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('set': Name@17) = ArrayList@187[1] { DeserializedSimpleFunctionDescriptor@188['set'] } // through DeserializedPackageMemberScope@180
-    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    functions('toString': Name@42) = ArrayList@189[3] { DeserializedSimpleFunctionDescriptor@190['toString'], DeserializedSimpleFunctionDescriptor@191['toString'], DeserializedSimpleFunctionDescriptor@192['toString'] } // through DeserializedPackageMemberScope@180
-    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@175
-    memberIndex = computeMemberIndex$1@193 // through LazyPackageFragmentScopeForJavaPackage@175
-    membersProtos = LinkedHashMap@194 // through DeserializedPackageMemberScope@180
-    properties('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('Unit': Name@165) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('get': Name@14) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('io': Name@184) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('jvm': Name@185) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('reflect': Name@186) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('set': Name@17) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('toString': Name@42) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('x': Name@166) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('y': Name@167) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
-    properties('z': Name@168) = EmptyList@15[empty] // through DeserializedPackageMemberScope@180
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('Any': Name@173) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('Unit': Name@153) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('io': Name@174) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('jvm': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('reflect': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    deserializedPackageScope = DeserializedPackageMemberScope@177 // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('invoke': Name@40) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('io': Name@178) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('io': Name@178) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('jvm': Name@179) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('jvm': Name@179) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('reflect': Name@180) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('reflect': Name@180) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@172
+    membersProtos = LinkedHashMap@182 // through DeserializedPackageMemberScope@177
+    properties('A': Name@148) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    properties('Unit': Name@165) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    properties('bar': Name@154) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    properties('foo': Name@155) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    properties('io': Name@178) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    properties('jvm': Name@179) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    properties('reflect': Name@180) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
+    properties('self': Name@157) = EmptyList@15[empty] // through DeserializedPackageMemberScope@177
 }
 
 LazyJavaPackageFragment@116['lang'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    memberIndex = computeMemberIndex$1@196 // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@183
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@183
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@183
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@183
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@183
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@183
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@183
+    memberIndex = computeMemberIndex$1@184 // through LazyPackageFragmentScopeForJavaPackage@183
 }
 
 LazyJavaPackageFragment@13['reflect'] {
-    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('KCallable': Name@198) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('KMemberProperty': Name@199) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('KMutableMemberProperty': Name@200) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('KMutableProperty': Name@201) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('KProperty': Name@202) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('get': Name@14) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('set': Name@17) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    classes('toString': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@197
-    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('get': Name@14) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('set': Name@17) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    functions('toString': Name@42) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@197
-    memberIndex = computeMemberIndex$1@203 // through LazyPackageFragmentScopeForJavaPackage@197
+    classes('A': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('KCallable': Name@186) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('KMemberProperty': Name@187) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('KMutableMemberProperty': Name@188) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('KMutableProperty': Name@189) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('KProperty': Name@190) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('String': Name@152) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('Unit': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('bar': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('foo': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('invoke': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    classes('self': Name@157) = null // through LazyPackageFragmentScopeForJavaPackage@185
+    deserializedPackageScope = Empty@158 // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('A': Name@148) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('bar': Name@154) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('foo': Name@155) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('invoke': Name@40) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    functions('self': Name@157) = EmptyList@15[empty] // through LazyPackageFragmentScopeForJavaPackage@185
+    memberIndex = computeMemberIndex$1@191 // through LazyPackageFragmentScopeForJavaPackage@185
 }
 
-NestedClassDescriptors@204 {
+NestedClassDescriptors@192 {
     findNestedClass('get': Name@14) = null
     findNestedClass('set': Name@17) = null
 }
 
-NestedClassDescriptors@205 {
+NestedClassDescriptors@193 {
     findNestedClass('get': Name@103) = null
 }
 
-NestedClassDescriptors@206 {
+NestedClassDescriptors@194 {
     findNestedClass('invoke': Name@40) = null
     findNestedClass('toString': Name@42) = null
 }
 
-TypeDeserializer@207 {
-    classDescriptors('2': Integer@208) = DeserializedClassDescriptor@209['Any']
+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> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@210 {
-    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@209['Any']
-    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@213) = DeserializedClassDescriptor@8['KMutableProperty']
+ResolutionTaskHolder@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]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@214 {
-    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@209['Any']
-    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@10['KProperty']
+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 }
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@215 {
-    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@209['Any']
+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]
 }
 
-TypeDeserializer@216 {
-    classDescriptors('3': Integer@211) = DeserializedClassDescriptor@217['String']
+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]
+    <name not found> = EmptyList@15[empty]
 }
 
-TypeDeserializer@218 {
-    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@2['KCallable']
+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]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
 }
 
-TypeDeserializer@219 {
-    classDescriptors('4': Integer@212) = DeserializedClassDescriptor@10['KProperty']
+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]
 }
 
-TypeDeserializer@220 {
-    classDescriptors('6': Integer@221) = DeserializedClassDescriptor@12['Unit']
+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@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@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[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]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@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]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@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]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <name not found> = EmptyList@15[empty]
+    <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@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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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@289 {
+    classDescriptors('2': Integer@290) = DeserializedClassDescriptor@291['Any']
+}
+
+TypeDeserializer@292 {
+    classDescriptors('3': Integer@293) = DeserializedClassDescriptor@291['Any']
+    classDescriptors('4': Integer@294) = DeserializedClassDescriptor@4['KMemberProperty']
+    classDescriptors('5': Integer@295) = DeserializedClassDescriptor@8['KMutableProperty']
+}
+
+TypeDeserializer@296 {
+    classDescriptors('3': Integer@293) = DeserializedClassDescriptor@291['Any']
+    classDescriptors('4': Integer@294) = DeserializedClassDescriptor@10['KProperty']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
index 6cc92502472..6d1f557fd38 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/memberFromTopLevel.lazy.log
@@ -16,486 +16,890 @@ DeserializedClassDescriptor@2['KCallable'] {
     functions('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
     functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
     membersProtos = LinkedHashMap@20 // through DeserializedClassMemberScope@18
-    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
+    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
     properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@18
 }
 
 DeserializedClassDescriptor@4['KMemberProperty'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    defaultType = JetTypeImpl@21['KMemberProperty<2>']
-    functions('get': Name@16) = ArrayList@22[1] { DeserializedSimpleFunctionDescriptor@23['get'] } // through DeserializedClassMemberScope@24
-    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@24
-    membersProtos = LinkedHashMap@25 // through DeserializedClassMemberScope@24
-    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@24
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@24
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@26['<this>']
+    defaultType = JetTypeImpl@22['KMemberProperty<2>']
+    functions('get': Name@16) = ArrayList@23[1] { DeserializedSimpleFunctionDescriptor@24['get'] } // through DeserializedClassMemberScope@25
+    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@25
+    membersProtos = LinkedHashMap@26 // through DeserializedClassMemberScope@25
+    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedClassMemberScope@25
+    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@25
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@27['<this>']
 }
 
 DeserializedClassDescriptor@6['KMutableMemberProperty'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    defaultType = JetTypeImpl@27['KMutableMemberProperty<2>']
-    functions('get': Name@28) = ArrayList@29[1] { DeserializedSimpleFunctionDescriptor@30['get'] } // through DeserializedClassMemberScope@31
-    functions('set': Name@32) = ArrayList@33[1] { DeserializedSimpleFunctionDescriptor@34['set'] } // through DeserializedClassMemberScope@31
-    membersProtos = LinkedHashMap@35 // through DeserializedClassMemberScope@31
-    properties('get': Name@28) = EmptyList@17[empty] // through DeserializedClassMemberScope@31
-    properties('set': Name@32) = EmptyList@17[empty] // through DeserializedClassMemberScope@31
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
+    defaultType = JetTypeImpl@28['KMutableMemberProperty<2>']
+    functions('get': Name@29) = ArrayList@30[1] { DeserializedSimpleFunctionDescriptor@31['get'] } // through DeserializedClassMemberScope@32
+    functions('set': Name@33) = ArrayList@34[1] { DeserializedSimpleFunctionDescriptor@35['set'] } // through DeserializedClassMemberScope@32
+    membersProtos = LinkedHashMap@36 // through DeserializedClassMemberScope@32
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@37['<this>']
 }
 
 DeserializedClassDescriptor@8['KMutableProperty'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    functions('get': Name@28) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
-    functions('set': Name@32) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
-    membersProtos = LinkedHashMap@38 // through DeserializedClassMemberScope@37
-    properties('get': Name@28) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
-    properties('set': Name@32) = EmptyList@17[empty] // through DeserializedClassMemberScope@37
+    functions('get': Name@29) = EmptyList@17[empty] // through DeserializedClassMemberScope@38
+    functions('set': Name@33) = EmptyList@17[empty] // through DeserializedClassMemberScope@38
+    membersProtos = LinkedHashMap@39 // through DeserializedClassMemberScope@38
 }
 
 DeserializedClassDescriptor@10['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@15['reflect']
-    functions('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
-    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
-    membersProtos = LinkedHashMap@40 // through DeserializedClassMemberScope@39
-    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@39
+    functions('get': Name@16) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
+    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
+    membersProtos = LinkedHashMap@41 // through DeserializedClassMemberScope@40
+    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
+    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedClassMemberScope@40
 }
 
 DeserializedClassDescriptor@12['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@41['kotlin']
+    containingDeclaration = LazyJavaPackageFragment@42['kotlin']
 }
 
-DeserializedTypeParameterDescriptor@42['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@43
-    upperBounds = LinkedHashSet@44[1] { DeserializedType@45['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@43['K'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@44
+    upperBounds = LinkedHashSet@45[1] { DeserializedType@46['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@46['R'] {
-    defaultType = JetTypeImpl@47['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    upperBounds = LinkedHashSet@49[1] { DeserializedType@50['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@47['R'] {
+    defaultType = JetTypeImpl@48['R']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    upperBounds = LinkedHashSet@50[1] { DeserializedType@51['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@51['R'] {
-    defaultType = JetTypeImpl@52['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
-    upperBounds = LinkedHashSet@54[1] { DeserializedType@55['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@52['R'] {
+    defaultType = JetTypeImpl@53['R']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@54
+    upperBounds = LinkedHashSet@55[1] { DeserializedType@56['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@56['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
+DeserializedTypeParameterDescriptor@57['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@58
 }
 
-DeserializedTypeParameterDescriptor@58['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@59
+DeserializedTypeParameterDescriptor@59['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@60
 }
 
-DeserializedTypeParameterDescriptor@60['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
+DeserializedTypeParameterDescriptor@61['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@62
 }
 
-DeserializedTypeParameterDescriptor@62['T'] {
-    defaultType = JetTypeImpl@63['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@64
-    upperBounds = LinkedHashSet@65[1] { DeserializedType@66['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@63['T'] {
+    defaultType = JetTypeImpl@64['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
+    upperBounds = LinkedHashSet@66[1] { DeserializedType@67['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@67['T'] {
-    defaultType = JetTypeImpl@68['T']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
-    upperBounds = LinkedHashSet@70[1] { DeserializedType@71['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@68['T'] {
+    defaultType = JetTypeImpl@69['T']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@70
+    upperBounds = LinkedHashSet@71[1] { DeserializedType@72['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@72['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-    upperBounds = LinkedHashSet@74[1] { DeserializedType@75['kotlin.Any'] }
-}
-
-DeserializedType@76['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
+DeserializedTypeParameterDescriptor@73['V'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@74
+    upperBounds = LinkedHashSet@75[1] { DeserializedType@76['kotlin.Any'] }
 }
 
 DeserializedType@77['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@43
+    constructor = AbstractLazyTypeParameterDescriptor$1@44
 }
 
-DeserializedType@78['R in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@53
+DeserializedType@78['K in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@44
 }
 
-DeserializedType@79['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+DeserializedType@79['R in kotlin.reflect.KMemberProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@54
 }
 
 DeserializedType@80['R in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+    constructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-DeserializedType@81['T in kotlin.reflect.KMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@64
+DeserializedType@81['R in kotlin.reflect.KMutableMemberProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@49
 }
 
-DeserializedType@82['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
+DeserializedType@82['T in kotlin.reflect.KMemberProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@65
 }
 
 DeserializedType@83['T in kotlin.reflect.KMutableMemberProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@69
+    constructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
-DeserializedType@84['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@73
+DeserializedType@84['T in kotlin.reflect.KMutableMemberProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@70
 }
 
 DeserializedType@85['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@73
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
 DeserializedType@86['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@73
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
-DeserializedType@71['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
+DeserializedType@87['V in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@74
 }
 
-DeserializedType@45['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
+DeserializedType@56['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
+DeserializedType@72['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@66['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
+DeserializedType@90['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@89['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
+DeserializedType@46['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@75['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
+DeserializedType@51['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@55['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@87
-    memberScope = DeserializedClassMemberScope@88
+DeserializedType@67['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@90['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@91
+DeserializedType@76['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@88
+    memberScope = DeserializedClassMemberScope@89
 }
 
-DeserializedType@92['kotlin.CharSequence'] {
-    constructor = DeserializedClassTypeConstructor@91
+DeserializedType@91['kotlin.CharSequence'] {
+    constructor = DeserializedClassTypeConstructor@92
 }
 
-DeserializedType@93['kotlin.MutableMap'] {
-    constructor = DeserializedClassTypeConstructor@94
-    memberScope = SubstitutingScope@95
+DeserializedType@93['kotlin.CharSequence'] {
+    constructor = DeserializedClassTypeConstructor@92
 }
 
-DeserializedType@96['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@97
-    memberScope = DeserializedClassMemberScope@98
+DeserializedType@94['kotlin.MutableMap'] {
+    constructor = DeserializedClassTypeConstructor@95
+    memberScope = SubstitutingScope@96
 }
 
-DeserializedType@99['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@100
-    memberScope = SubstitutingScope@101
+DeserializedType@97['kotlin.Unit'] {
+    constructor = DeserializedClassTypeConstructor@98
+    memberScope = DeserializedClassMemberScope@99
 }
 
-DeserializedType@102['kotlin.reflect.KMemberProperty'] {
-    constructor = DeserializedClassTypeConstructor@103
-    memberScope = SubstitutingScope@104
+DeserializedType@100['kotlin.reflect.KCallable'] {
+    constructor = DeserializedClassTypeConstructor@101
+    memberScope = SubstitutingScope@102
 }
 
-DeserializedType@105['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@106
-    memberScope = SubstitutingScope@107
+DeserializedType@103['kotlin.reflect.KMemberProperty'] {
+    constructor = DeserializedClassTypeConstructor@104
+    memberScope = SubstitutingScope@105
 }
 
-DeserializedType@108['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@109
-    memberScope = SubstitutingScope@110
+DeserializedType@106['kotlin.reflect.KMutableProperty'] {
+    constructor = DeserializedClassTypeConstructor@107
+    memberScope = SubstitutingScope@108
 }
 
-DeserializedType@111['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@109
-    memberScope = SubstitutingScope@112
+DeserializedType@109['kotlin.reflect.KProperty'] {
+    constructor = DeserializedClassTypeConstructor@110
+    memberScope = SubstitutingScope@111
 }
 
-EnumEntryClassDescriptors@113 {
+DeserializedType@112['kotlin.reflect.KProperty'] {
+    constructor = DeserializedClassTypeConstructor@110
+    memberScope = SubstitutingScope@113
+}
+
+EnumEntryClassDescriptors@114 {
     findEnumEntry('get': Name@16) = null
     findEnumEntry('set': Name@19) = null
 }
 
-EnumEntryClassDescriptors@114 {
-    findEnumEntry('get': Name@28) = null
-    findEnumEntry('set': Name@32) = null
+EnumEntryClassDescriptors@115 {
+    findEnumEntry('get': Name@29) = null
+    findEnumEntry('set': Name@33) = null
 }
 
-LazyJavaPackageFragmentProvider@115 {
-    packageFragments('<root>': FqName@116) = LazyJavaPackageFragment@117['<root>']
-    packageFragments('A': FqName@118) = null
-    packageFragments('Int': FqName@119) = null
-    packageFragments('KMemberProperty': FqName@120) = null
-    packageFragments('KMutableMemberProperty': FqName@121) = null
-    packageFragments('String': FqName@122) = null
-    packageFragments('java': FqName@123) = LazyJavaPackageFragment@124['java']
-    packageFragments('java.lang': FqName@125) = LazyJavaPackageFragment@126['lang']
-    packageFragments('java.lang.A': FqName@127) = null
-    packageFragments('java.lang.Int': FqName@128) = null
-    packageFragments('java.lang.KMemberProperty': FqName@129) = null
-    packageFragments('java.lang.KMutableMemberProperty': FqName@130) = null
-    packageFragments('java.lang.String': FqName@131) = null
-    packageFragments('kotlin': FqName@132) = LazyJavaPackageFragment@41['kotlin']
-    packageFragments('kotlin.A': FqName@133) = null
-    packageFragments('kotlin.Int': FqName@134) = null
-    packageFragments('kotlin.KMemberProperty': FqName@135) = null
-    packageFragments('kotlin.KMutableMemberProperty': FqName@136) = null
-    packageFragments('kotlin.String': FqName@137) = null
-    packageFragments('kotlin.io': FqName@138) = LazyJavaPackageFragment@139['io']
-    packageFragments('kotlin.io.A': FqName@140) = null
-    packageFragments('kotlin.io.Int': FqName@141) = null
-    packageFragments('kotlin.io.KMemberProperty': FqName@142) = null
-    packageFragments('kotlin.io.KMutableMemberProperty': FqName@143) = null
-    packageFragments('kotlin.io.String': FqName@144) = null
-    packageFragments('kotlin.jvm': FqName@145) = LazyJavaPackageFragment@146['jvm']
-    packageFragments('kotlin.jvm.A': FqName@147) = null
-    packageFragments('kotlin.jvm.Int': FqName@148) = null
-    packageFragments('kotlin.jvm.KMemberProperty': FqName@149) = null
-    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@150) = null
-    packageFragments('kotlin.jvm.String': FqName@151) = null
-    packageFragments('kotlin.reflect': FqName@152) = LazyJavaPackageFragment@15['reflect']
-    packageFragments('kotlin.reflect.A': FqName@153) = null
-    packageFragments('kotlin.reflect.Int': FqName@154) = null
-    packageFragments('kotlin.reflect.KMemberProperty': FqName@155) = null
-    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@156) = null
-    packageFragments('kotlin.reflect.String': FqName@157) = null
+LazyJavaPackageFragmentProvider@116 {
+    packageFragments('<root>': FqName@117) = LazyJavaPackageFragment@118['<root>']
+    packageFragments('A': FqName@119) = null
+    packageFragments('Int': FqName@120) = null
+    packageFragments('KMemberProperty': FqName@121) = null
+    packageFragments('KMutableMemberProperty': FqName@122) = null
+    packageFragments('String': FqName@123) = null
+    packageFragments('java': FqName@124) = LazyJavaPackageFragment@125['java']
+    packageFragments('java.lang': FqName@126) = LazyJavaPackageFragment@127['lang']
+    packageFragments('java.lang.A': FqName@128) = null
+    packageFragments('java.lang.Int': FqName@129) = null
+    packageFragments('java.lang.KMemberProperty': FqName@130) = null
+    packageFragments('java.lang.KMutableMemberProperty': FqName@131) = null
+    packageFragments('java.lang.String': FqName@132) = null
+    packageFragments('kotlin': FqName@133) = LazyJavaPackageFragment@42['kotlin']
+    packageFragments('kotlin.A': FqName@134) = null
+    packageFragments('kotlin.Int': FqName@135) = null
+    packageFragments('kotlin.KMemberProperty': FqName@136) = null
+    packageFragments('kotlin.KMutableMemberProperty': FqName@137) = null
+    packageFragments('kotlin.String': FqName@138) = null
+    packageFragments('kotlin.io': FqName@139) = LazyJavaPackageFragment@140['io']
+    packageFragments('kotlin.io.A': FqName@141) = null
+    packageFragments('kotlin.io.Int': FqName@142) = null
+    packageFragments('kotlin.io.KMemberProperty': FqName@143) = null
+    packageFragments('kotlin.io.KMutableMemberProperty': FqName@144) = null
+    packageFragments('kotlin.io.String': FqName@145) = null
+    packageFragments('kotlin.jvm': FqName@146) = LazyJavaPackageFragment@147['jvm']
+    packageFragments('kotlin.jvm.A': FqName@148) = null
+    packageFragments('kotlin.jvm.Int': FqName@149) = null
+    packageFragments('kotlin.jvm.KMemberProperty': FqName@150) = null
+    packageFragments('kotlin.jvm.KMutableMemberProperty': FqName@151) = null
+    packageFragments('kotlin.jvm.String': FqName@152) = null
+    packageFragments('kotlin.reflect': FqName@153) = LazyJavaPackageFragment@15['reflect']
+    packageFragments('kotlin.reflect.A': FqName@154) = null
+    packageFragments('kotlin.reflect.Int': FqName@155) = null
+    packageFragments('kotlin.reflect.KMemberProperty': FqName@156) = null
+    packageFragments('kotlin.reflect.KMutableMemberProperty': FqName@157) = null
+    packageFragments('kotlin.reflect.String': FqName@158) = null
 }
 
-LazyJavaPackageFragment@117['<root>'] {
-    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('KMemberProperty': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('KMutableMemberProperty': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('kotlin': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('kotlin': Name@169) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    memberIndex = computeMemberIndex$1@170 // through LazyPackageFragmentScopeForJavaPackage@159
+LazyJavaPackageFragment@118['<root>'] {
+    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('KMemberProperty': Name@162) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('KMutableMemberProperty': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('kotlin': Name@168) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@160
+    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@160
+    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
+    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
+    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
+    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
+    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
+    functions('kotlin': Name@170) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@160
+    memberIndex = computeMemberIndex$1@171 // through LazyPackageFragmentScopeForJavaPackage@160
 }
 
-LazyJavaPackageFragment@139['io'] {
-    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@171
-    deserializedPackageScope = DeserializedPackageMemberScope@172 // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('invoke': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@171
-    memberIndex = computeMemberIndex$1@173 // through LazyPackageFragmentScopeForJavaPackage@171
-    membersProtos = LinkedHashMap@174 // through DeserializedPackageMemberScope@172
-    properties('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    properties('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    properties('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@172
+LazyJavaPackageFragment@140['io'] {
+    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@172
+    deserializedPackageScope = DeserializedPackageMemberScope@173 // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('get': Name@21) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('invoke': Name@167) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    functions('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@172
+    memberIndex = computeMemberIndex$1@174 // through LazyPackageFragmentScopeForJavaPackage@172
+    membersProtos = LinkedHashMap@175 // through DeserializedPackageMemberScope@173
+    properties('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    properties('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    properties('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
+    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@173
 }
 
-LazyJavaPackageFragment@124['java'] {
-    classes('lang': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@176
-    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@176
-    functions('lang': Name@177) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@176
-    memberIndex = computeMemberIndex$1@178 // through LazyPackageFragmentScopeForJavaPackage@176
+LazyJavaPackageFragment@125['java'] {
+    classes('lang': Name@176) = null // through LazyPackageFragmentScopeForJavaPackage@177
+    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@177
+    functions('lang': Name@178) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@177
+    memberIndex = computeMemberIndex$1@179 // through LazyPackageFragmentScopeForJavaPackage@177
 }
 
-LazyJavaPackageFragment@146['jvm'] {
-    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@179
-    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@179
-    memberIndex = computeMemberIndex$1@180 // through LazyPackageFragmentScopeForJavaPackage@179
+LazyJavaPackageFragment@147['jvm'] {
+    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@180
+    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@180
+    memberIndex = computeMemberIndex$1@181 // through LazyPackageFragmentScopeForJavaPackage@180
 }
 
-LazyJavaPackageFragment@41['kotlin'] {
-    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('Any': Name@182) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('CharSequence': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('MutableMap': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('Unit': Name@185) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('io': Name@186) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('jvm': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('reflect': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@181
-    deserializedPackageScope = DeserializedPackageMemberScope@189 // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('get': Name@16) = ArrayList@190[2] { DeserializedSimpleFunctionDescriptor@191['get'], DeserializedSimpleFunctionDescriptor@192['get'] } // through DeserializedPackageMemberScope@189
-    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('invoke': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('io': Name@193) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    functions('io': Name@193) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('jvm': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    functions('jvm': Name@194) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('reflect': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    functions('reflect': Name@195) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    functions('set': Name@19) = ArrayList@196[1] { DeserializedSimpleFunctionDescriptor@197['set'] } // through DeserializedPackageMemberScope@189
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@181
-    memberIndex = computeMemberIndex$1@198 // through LazyPackageFragmentScopeForJavaPackage@181
-    membersProtos = LinkedHashMap@199 // through DeserializedPackageMemberScope@189
-    properties('A': Name@158) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    properties('bar': Name@164) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    properties('foo': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    properties('get': Name@16) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    properties('io': Name@193) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    properties('jvm': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    properties('reflect': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
-    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@189
+LazyJavaPackageFragment@42['kotlin'] {
+    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('Any': Name@183) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('CharSequence': Name@184) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('MutableMap': Name@185) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('Unit': Name@186) = DeserializedClassDescriptor@12['Unit'] // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('io': Name@187) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('jvm': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('reflect': Name@189) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@182
+    deserializedPackageScope = DeserializedPackageMemberScope@190 // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('get': Name@21) = ArrayList@191[2] { DeserializedSimpleFunctionDescriptor@192['get'], DeserializedSimpleFunctionDescriptor@193['get'] } // through DeserializedPackageMemberScope@190
+    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('invoke': Name@167) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('io': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    functions('io': Name@194) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('jvm': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    functions('jvm': Name@195) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('reflect': Name@196) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    functions('reflect': Name@196) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    functions('set': Name@19) = ArrayList@197[1] { DeserializedSimpleFunctionDescriptor@198['set'] } // through DeserializedPackageMemberScope@190
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@182
+    memberIndex = computeMemberIndex$1@199 // through LazyPackageFragmentScopeForJavaPackage@182
+    membersProtos = LinkedHashMap@200 // through DeserializedPackageMemberScope@190
+    properties('A': Name@159) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    properties('bar': Name@165) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    properties('foo': Name@166) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    properties('get': Name@21) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    properties('io': Name@194) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    properties('jvm': Name@195) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    properties('reflect': Name@196) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
+    properties('set': Name@19) = EmptyList@17[empty] // through DeserializedPackageMemberScope@190
 }
 
-LazyJavaPackageFragment@126['lang'] {
-    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@200
-    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@200
-    memberIndex = computeMemberIndex$1@201 // through LazyPackageFragmentScopeForJavaPackage@200
+LazyJavaPackageFragment@127['lang'] {
+    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@201
+    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@201
+    memberIndex = computeMemberIndex$1@202 // through LazyPackageFragmentScopeForJavaPackage@201
 }
 
 LazyJavaPackageFragment@15['reflect'] {
-    classes('A': Name@158) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('Int': Name@160) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('KCallable': Name@203) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('KMemberProperty': Name@204) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('KMutableMemberProperty': Name@162) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('KMutableProperty': Name@205) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('KProperty': Name@206) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('String': Name@163) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('bar': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('foo': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('get': Name@16) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('invoke': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@202
-    deserializedPackageScope = Empty@168 // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('A': Name@158) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('bar': Name@164) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('foo': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('get': Name@16) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('invoke': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@202
-    memberIndex = computeMemberIndex$1@207 // through LazyPackageFragmentScopeForJavaPackage@202
+    classes('A': Name@159) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('Int': Name@161) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('KCallable': Name@204) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('KMemberProperty': Name@205) = DeserializedClassDescriptor@4['KMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('KMutableMemberProperty': Name@163) = DeserializedClassDescriptor@6['KMutableMemberProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('KMutableProperty': Name@206) = DeserializedClassDescriptor@8['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('KProperty': Name@207) = DeserializedClassDescriptor@10['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('String': Name@164) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('bar': Name@165) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('foo': Name@166) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('get': Name@21) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('invoke': Name@167) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    classes('set': Name@19) = null // through LazyPackageFragmentScopeForJavaPackage@203
+    deserializedPackageScope = Empty@169 // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('A': Name@159) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('bar': Name@165) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('foo': Name@166) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('get': Name@21) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('invoke': Name@167) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    functions('set': Name@19) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@203
+    memberIndex = computeMemberIndex$1@208 // through LazyPackageFragmentScopeForJavaPackage@203
 }
 
-NestedClassDescriptors@208 {
+NestedClassDescriptors@209 {
     findNestedClass('get': Name@16) = null
     findNestedClass('set': Name@19) = null
 }
 
-NestedClassDescriptors@209 {
-    findNestedClass('get': Name@28) = null
-    findNestedClass('set': Name@32) = null
+NestedClassDescriptors@210 {
+    findNestedClass('get': Name@29) = null
+    findNestedClass('set': Name@33) = null
 }
 
-TypeDeserializer@210 {
-    classDescriptors('102': Integer@211) = DeserializedClassDescriptor@212['MutableMap']
-    classDescriptors('2': Integer@213) = DeserializedClassDescriptor@214['Any']
+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> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@215 {
-    classDescriptors('3': Integer@216) = DeserializedClassDescriptor@214['Any']
-    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@4['KMemberProperty']
-    classDescriptors('5': Integer@218) = DeserializedClassDescriptor@8['KMutableProperty']
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@219 {
-    classDescriptors('3': Integer@216) = DeserializedClassDescriptor@214['Any']
-    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@10['KProperty']
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@220 {
-    classDescriptors('3': Integer@216) = DeserializedClassDescriptor@214['Any']
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
 }
 
-TypeDeserializer@221 {
-    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@2['KCallable']
+ResolutionTaskHolder@231 {
+    <name not found> = ArrayList@232[1] { ResolutionCandidate@233 }
+    <name not found> = ArrayList@234[1] { ResolutionCandidate@233 }
+    <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@222 {
-    classDescriptors('4': Integer@217) = DeserializedClassDescriptor@10['KProperty']
+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]
 }
 
-TypeDeserializer@223 {
-    classDescriptors('59': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
+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]
 }
 
-TypeDeserializer@226 {
-    classDescriptors('59': Integer@224) = DeserializedClassDescriptor@225['CharSequence']
+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]
 }
 
-TypeDeserializer@227 {
-    classDescriptors('6': Integer@228) = DeserializedClassDescriptor@12['Unit']
+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> = 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> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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@313 {
+    classDescriptors('129': Integer@314) = DeserializedClassDescriptor@315['MutableMap']
+    classDescriptors('9': Integer@316) = DeserializedClassDescriptor@317['Any']
+}
+
+TypeDeserializer@318 {
+    classDescriptors('3': Integer@319) = DeserializedClassDescriptor@317['Any']
+    classDescriptors('4': Integer@320) = DeserializedClassDescriptor@4['KMemberProperty']
+    classDescriptors('5': Integer@321) = DeserializedClassDescriptor@8['KMutableProperty']
+}
+
+TypeDeserializer@322 {
+    classDescriptors('3': Integer@319) = DeserializedClassDescriptor@317['Any']
+    classDescriptors('4': Integer@320) = DeserializedClassDescriptor@10['KProperty']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
index 6dd6fcb5390..ffab33f0edc 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/property/topLevelFromTopLevel.lazy.log
@@ -17,384 +17,371 @@ DeserializedClassDescriptor@2['KCallable'] {
     functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
     functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
     membersProtos = LinkedHashMap@27 // through DeserializedClassMemberScope@25
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
     properties('name': Name@28) = ArrayList@29[1] { DeserializedPropertyDescriptor@30['name'] } // through DeserializedClassMemberScope@25
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@31['<this>']
+    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@25
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@32['<this>']
 }
 
 DeserializedClassDescriptor@4['KMutableProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
-    membersProtos = LinkedHashMap@33 // through DeserializedClassMemberScope@32
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
-    properties('name': Name@28) = ArrayList@34[1] { DeserializedPropertyDescriptor@35['name'] } // through DeserializedClassMemberScope@32
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@32
+    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@33
+    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@33
+    membersProtos = LinkedHashMap@34 // through DeserializedClassMemberScope@33
+    properties('name': Name@28) = ArrayList@35[1] { DeserializedPropertyDescriptor@36['name'] } // through DeserializedClassMemberScope@33
 }
 
 DeserializedClassDescriptor@6['KMutableTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
-    membersProtos = LinkedHashMap@37 // through DeserializedClassMemberScope@36
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
-    properties('name': Name@28) = ArrayList@38[1] { DeserializedPropertyDescriptor@39['name'] } // through DeserializedClassMemberScope@36
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@36
+    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@37
+    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@37
+    membersProtos = LinkedHashMap@38 // through DeserializedClassMemberScope@37
+    properties('name': Name@28) = ArrayList@39[1] { DeserializedPropertyDescriptor@40['name'] } // through DeserializedClassMemberScope@37
 }
 
 DeserializedClassDescriptor@8['KMutableTopLevelVariable'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = ArrayList@40[1] { DeserializedSimpleFunctionDescriptor@41['get'] } // through DeserializedClassMemberScope@42
-    functions('set': Name@26) = ArrayList@43[1] { DeserializedSimpleFunctionDescriptor@44['set'] } // through DeserializedClassMemberScope@42
-    membersProtos = LinkedHashMap@45 // through DeserializedClassMemberScope@42
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@42
-    properties('name': Name@28) = ArrayList@46[1] { DeserializedPropertyDescriptor@47['name'] } // through DeserializedClassMemberScope@42
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@42
+    functions('get': Name@23) = ArrayList@41[1] { DeserializedSimpleFunctionDescriptor@42['get'] } // through DeserializedClassMemberScope@43
+    functions('set': Name@26) = ArrayList@44[1] { DeserializedSimpleFunctionDescriptor@45['set'] } // through DeserializedClassMemberScope@43
+    membersProtos = LinkedHashMap@46 // through DeserializedClassMemberScope@43
+    properties('name': Name@28) = ArrayList@47[1] { DeserializedPropertyDescriptor@48['name'] } // through DeserializedClassMemberScope@43
 }
 
 DeserializedClassDescriptor@10['KMutableVariable'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@48['KMutableVariable<1>']
-    functions('get': Name@23) = ArrayList@49[1] { DeserializedSimpleFunctionDescriptor@50['get'] } // through DeserializedClassMemberScope@51
-    functions('set': Name@26) = ArrayList@52[1] { DeserializedSimpleFunctionDescriptor@53['set'] } // through DeserializedClassMemberScope@51
-    membersProtos = LinkedHashMap@54 // through DeserializedClassMemberScope@51
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@51
-    properties('name': Name@28) = ArrayList@55[1] { DeserializedPropertyDescriptor@56['name'] } // through DeserializedClassMemberScope@51
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@51
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@57['<this>']
+    defaultType = JetTypeImpl@49['KMutableVariable<1>']
+    functions('get': Name@23) = ArrayList@50[1] { DeserializedSimpleFunctionDescriptor@51['get'] } // through DeserializedClassMemberScope@52
+    functions('set': Name@26) = ArrayList@53[1] { DeserializedSimpleFunctionDescriptor@54['set'] } // through DeserializedClassMemberScope@52
+    membersProtos = LinkedHashMap@55 // through DeserializedClassMemberScope@52
+    properties('name': Name@28) = ArrayList@56[1] { DeserializedPropertyDescriptor@57['name'] } // through DeserializedClassMemberScope@52
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@58['<this>']
 }
 
 DeserializedClassDescriptor@12['KProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
-    membersProtos = LinkedHashMap@59 // through DeserializedClassMemberScope@58
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
-    properties('name': Name@28) = ArrayList@60[1] { DeserializedPropertyDescriptor@61['name'] } // through DeserializedClassMemberScope@58
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@58
+    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@59
+    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@59
+    membersProtos = LinkedHashMap@60 // through DeserializedClassMemberScope@59
+    properties('name': Name@28) = ArrayList@61[1] { DeserializedPropertyDescriptor@62['name'] } // through DeserializedClassMemberScope@59
+    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@59
 }
 
 DeserializedClassDescriptor@14['KTopLevelProperty'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
-    membersProtos = LinkedHashMap@63 // through DeserializedClassMemberScope@62
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
-    properties('name': Name@28) = ArrayList@64[1] { DeserializedPropertyDescriptor@65['name'] } // through DeserializedClassMemberScope@62
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@62
+    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@63
+    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@63
+    membersProtos = LinkedHashMap@64 // through DeserializedClassMemberScope@63
+    properties('name': Name@28) = ArrayList@65[1] { DeserializedPropertyDescriptor@66['name'] } // through DeserializedClassMemberScope@63
+    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@63
 }
 
 DeserializedClassDescriptor@16['KTopLevelVariable'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@66['KTopLevelVariable<1>']
-    functions('get': Name@23) = ArrayList@67[1] { DeserializedSimpleFunctionDescriptor@68['get'] } // through DeserializedClassMemberScope@69
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@69
-    membersProtos = LinkedHashMap@70 // through DeserializedClassMemberScope@69
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@69
-    properties('name': Name@28) = ArrayList@71[1] { DeserializedPropertyDescriptor@72['name'] } // through DeserializedClassMemberScope@69
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@69
+    defaultType = JetTypeImpl@67['KTopLevelVariable<1>']
+    functions('get': Name@23) = ArrayList@68[1] { DeserializedSimpleFunctionDescriptor@69['get'] } // through DeserializedClassMemberScope@70
+    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@70
+    membersProtos = LinkedHashMap@71 // through DeserializedClassMemberScope@70
+    properties('name': Name@28) = ArrayList@72[1] { DeserializedPropertyDescriptor@73['name'] } // through DeserializedClassMemberScope@70
+    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@70
 }
 
 DeserializedClassDescriptor@18['KVariable'] {
     containingDeclaration = LazyJavaPackageFragment@21['reflect']
-    defaultType = JetTypeImpl@73['KVariable<1>']
-    functions('get': Name@23) = ArrayList@74[1] { DeserializedSimpleFunctionDescriptor@75['get'] } // through DeserializedClassMemberScope@76
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@76
-    membersProtos = LinkedHashMap@77 // through DeserializedClassMemberScope@76
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedClassMemberScope@76
-    properties('name': Name@28) = ArrayList@78[1] { DeserializedPropertyDescriptor@79['name'] } // through DeserializedClassMemberScope@76
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@76
-    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@80['<this>']
+    defaultType = JetTypeImpl@74['KVariable<1>']
+    functions('get': Name@23) = ArrayList@75[1] { DeserializedSimpleFunctionDescriptor@76['get'] } // through DeserializedClassMemberScope@77
+    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedClassMemberScope@77
+    membersProtos = LinkedHashMap@78 // through DeserializedClassMemberScope@77
+    properties('name': Name@28) = ArrayList@79[1] { DeserializedPropertyDescriptor@80['name'] } // through DeserializedClassMemberScope@77
+    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedClassMemberScope@77
+    thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@81['<this>']
 }
 
 DeserializedClassDescriptor@20['Unit'] {
-    containingDeclaration = LazyJavaPackageFragment@81['kotlin']
+    containingDeclaration = LazyJavaPackageFragment@82['kotlin']
 }
 
-DeserializedTypeParameterDescriptor@82['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@83
-    upperBounds = LinkedHashSet@84[1] { DeserializedType@85['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@83['K'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@84
+    upperBounds = LinkedHashSet@85[1] { DeserializedType@86['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@86['R'] {
-    defaultType = JetTypeImpl@87['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@88
-    upperBounds = LinkedHashSet@89[1] { DeserializedType@90['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@87['R'] {
+    defaultType = JetTypeImpl@88['R']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
+    upperBounds = LinkedHashSet@90[1] { DeserializedType@91['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@91['R'] {
-    defaultType = JetTypeImpl@92['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@93
-    upperBounds = LinkedHashSet@94[1] { DeserializedType@95['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@92['R'] {
+    defaultType = JetTypeImpl@93['R']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@94
+    upperBounds = LinkedHashSet@95[1] { DeserializedType@96['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@96['R'] {
-    defaultType = JetTypeImpl@97['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@98
-    upperBounds = LinkedHashSet@99[1] { DeserializedType@100['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@97['R'] {
+    defaultType = JetTypeImpl@98['R']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@99
+    upperBounds = LinkedHashSet@100[1] { DeserializedType@101['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@101['R'] {
-    defaultType = JetTypeImpl@102['R']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@103
+DeserializedTypeParameterDescriptor@102['R'] {
+    defaultType = JetTypeImpl@103['R']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@104
 }
 
-DeserializedTypeParameterDescriptor@104['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@105
-    upperBounds = LinkedHashSet@106[1] { DeserializedType@107['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@105['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@106
+    upperBounds = LinkedHashSet@107[1] { DeserializedType@108['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@108['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@109
-    upperBounds = LinkedHashSet@110[1] { DeserializedType@111['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@109['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@110
+    upperBounds = LinkedHashSet@111[1] { DeserializedType@112['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@112['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@113
-    upperBounds = LinkedHashSet@114[1] { DeserializedType@115['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@113['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@114
+    upperBounds = LinkedHashSet@115[1] { DeserializedType@116['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@116['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@117
-    upperBounds = LinkedHashSet@118[1] { DeserializedType@119['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@117['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@118
+    upperBounds = LinkedHashSet@119[1] { DeserializedType@120['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@120['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@121
-    upperBounds = LinkedHashSet@122[1] { DeserializedType@123['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@121['R'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@122
+    upperBounds = LinkedHashSet@123[1] { DeserializedType@124['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@124['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@125
-    upperBounds = LinkedHashSet@126[1] { DeserializedType@127['kotlin.Any'] }
-}
-
-DeserializedType@128['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@83
+DeserializedTypeParameterDescriptor@125['V'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@126
+    upperBounds = LinkedHashSet@127[1] { DeserializedType@128['kotlin.Any'] }
 }
 
 DeserializedType@129['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@83
+    constructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-DeserializedType@130['R in kotlin.reflect.KMutableProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@121
+DeserializedType@130['K in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@84
 }
 
-DeserializedType@131['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@117
+DeserializedType@131['R in kotlin.reflect.KMutableProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@118
 }
 
 DeserializedType@132['R in kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@117
+    constructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
-DeserializedType@133['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@113
+DeserializedType@133['R in kotlin.reflect.KMutableTopLevelProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@110
 }
 
 DeserializedType@134['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@113
+    constructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 DeserializedType@135['R in kotlin.reflect.KMutableTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@113
+    constructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
-DeserializedType@136['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
+DeserializedType@136['R in kotlin.reflect.KMutableTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@114
 }
 
 DeserializedType@137['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
+    constructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
 DeserializedType@138['R in kotlin.reflect.KMutableVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@98
+    constructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
-DeserializedType@139['R in kotlin.reflect.KProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@109
+DeserializedType@139['R in kotlin.reflect.KMutableVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@94
 }
 
-DeserializedType@140['R in kotlin.reflect.KTopLevelProperty'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@105
+DeserializedType@140['R in kotlin.reflect.KProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@106
 }
 
-DeserializedType@141['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@93
+DeserializedType@141['R in kotlin.reflect.KTopLevelProperty'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@122
 }
 
 DeserializedType@142['R in kotlin.reflect.KTopLevelVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@93
+    constructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
-DeserializedType@143['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
+DeserializedType@143['R in kotlin.reflect.KTopLevelVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@99
 }
 
 DeserializedType@144['R in kotlin.reflect.KVariable'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@103
+    constructor = AbstractLazyTypeParameterDescriptor$1@104
 }
 
-DeserializedType@145['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@125
+DeserializedType@145['R in kotlin.reflect.KVariable'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@104
 }
 
 DeserializedType@146['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@125
+    constructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
 DeserializedType@147['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@125
+    constructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
-DeserializedType@111['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@148['V in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@126
 }
 
-DeserializedType@127['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@108['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@100['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@151['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@150['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@124['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@95['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@101['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@107['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@112['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@119['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@96['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@123['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@86['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@115['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@128['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@85['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@91['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@90['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@148
-    memberScope = DeserializedClassMemberScope@149
+DeserializedType@116['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@151['kotlin.MutableMap'] {
-    constructor = DeserializedClassTypeConstructor@152
-    memberScope = SubstitutingScope@153
+DeserializedType@120['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@149
+    memberScope = DeserializedClassMemberScope@150
 }
 
-DeserializedType@154['kotlin.String'] {
-    constructor = DeserializedClassTypeConstructor@155
-    memberScope = DeserializedClassMemberScope@156
+DeserializedType@152['kotlin.MutableMap'] {
+    constructor = DeserializedClassTypeConstructor@153
+    memberScope = SubstitutingScope@154
 }
 
-DeserializedType@157['kotlin.Unit'] {
-    constructor = DeserializedClassTypeConstructor@158
-    memberScope = DeserializedClassMemberScope@159
+DeserializedType@155['kotlin.String'] {
+    constructor = DeserializedClassTypeConstructor@156
+    memberScope = DeserializedClassMemberScope@157
 }
 
-DeserializedType@160['kotlin.reflect.KCallable'] {
-    constructor = DeserializedClassTypeConstructor@161
-    memberScope = SubstitutingScope@162
+DeserializedType@158['kotlin.Unit'] {
+    constructor = DeserializedClassTypeConstructor@159
+    memberScope = DeserializedClassMemberScope@160
 }
 
-DeserializedType@163['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@164
-    memberScope = SubstitutingScope@165
+DeserializedType@161['kotlin.reflect.KCallable'] {
+    constructor = DeserializedClassTypeConstructor@162
+    memberScope = SubstitutingScope@163
 }
 
-DeserializedType@166['kotlin.reflect.KMutableProperty'] {
-    constructor = DeserializedClassTypeConstructor@164
-    memberScope = SubstitutingScope@167
+DeserializedType@164['kotlin.reflect.KMutableProperty'] {
+    constructor = DeserializedClassTypeConstructor@165
+    memberScope = SubstitutingScope@166
 }
 
-DeserializedType@168['kotlin.reflect.KMutableTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@169
-    memberScope = SubstitutingScope@170
+DeserializedType@167['kotlin.reflect.KMutableProperty'] {
+    constructor = DeserializedClassTypeConstructor@165
+    memberScope = SubstitutingScope@168
 }
 
-DeserializedType@171['kotlin.reflect.KMutableVariable'] {
-    constructor = DeserializedClassTypeConstructor@172
-    memberScope = SubstitutingScope@173
+DeserializedType@169['kotlin.reflect.KMutableTopLevelProperty'] {
+    constructor = DeserializedClassTypeConstructor@170
+    memberScope = SubstitutingScope@171
 }
 
-DeserializedType@174['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@175
-    memberScope = SubstitutingScope@176
+DeserializedType@172['kotlin.reflect.KMutableVariable'] {
+    constructor = DeserializedClassTypeConstructor@173
+    memberScope = SubstitutingScope@174
 }
 
-DeserializedType@177['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@175
-    memberScope = SubstitutingScope@178
+DeserializedType@175['kotlin.reflect.KProperty'] {
+    constructor = DeserializedClassTypeConstructor@176
+    memberScope = SubstitutingScope@177
 }
 
-DeserializedType@179['kotlin.reflect.KProperty'] {
-    constructor = DeserializedClassTypeConstructor@175
-    memberScope = SubstitutingScope@180
+DeserializedType@178['kotlin.reflect.KProperty'] {
+    constructor = DeserializedClassTypeConstructor@176
+    memberScope = SubstitutingScope@179
 }
 
-DeserializedType@181['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@182
-    memberScope = SubstitutingScope@183
+DeserializedType@180['kotlin.reflect.KProperty'] {
+    constructor = DeserializedClassTypeConstructor@176
+    memberScope = SubstitutingScope@181
 }
 
-DeserializedType@184['kotlin.reflect.KTopLevelProperty'] {
-    constructor = DeserializedClassTypeConstructor@182
-    memberScope = SubstitutingScope@185
+DeserializedType@182['kotlin.reflect.KTopLevelProperty'] {
+    constructor = DeserializedClassTypeConstructor@183
+    memberScope = SubstitutingScope@184
 }
 
-DeserializedType@186['kotlin.reflect.KTopLevelVariable'] {
-    constructor = DeserializedClassTypeConstructor@187
-    memberScope = SubstitutingScope@188
+DeserializedType@185['kotlin.reflect.KTopLevelProperty'] {
+    constructor = DeserializedClassTypeConstructor@183
+    memberScope = SubstitutingScope@186
 }
 
-DeserializedType@189['kotlin.reflect.KVariable'] {
-    constructor = DeserializedClassTypeConstructor@190
-    memberScope = SubstitutingScope@191
+DeserializedType@187['kotlin.reflect.KTopLevelVariable'] {
+    constructor = DeserializedClassTypeConstructor@188
+    memberScope = SubstitutingScope@189
 }
 
-DeserializedType@192['kotlin.reflect.KVariable'] {
-    constructor = DeserializedClassTypeConstructor@190
-    memberScope = SubstitutingScope@193
+DeserializedType@190['kotlin.reflect.KVariable'] {
+    constructor = DeserializedClassTypeConstructor@191
+    memberScope = SubstitutingScope@192
 }
 
-EnumEntryClassDescriptors@194 {
-    findEnumEntry('get': Name@23) = null
-    findEnumEntry('name': Name@28) = null
-    findEnumEntry('set': Name@26) = null
+DeserializedType@193['kotlin.reflect.KVariable'] {
+    constructor = DeserializedClassTypeConstructor@191
+    memberScope = SubstitutingScope@194
 }
 
 EnumEntryClassDescriptors@195 {
     findEnumEntry('get': Name@196) = null
     findEnumEntry('name': Name@197) = null
-    findEnumEntry('set': Name@198) = null
+    findEnumEntry('set': Name@31) = null
+}
+
+EnumEntryClassDescriptors@198 {
+    findEnumEntry('get': Name@23) = null
+    findEnumEntry('name': Name@28) = null
+    findEnumEntry('set': Name@26) = null
 }
 
 LazyJavaPackageFragmentProvider@199 {
@@ -421,7 +408,7 @@ LazyJavaPackageFragmentProvider@199 {
     packageFragments('java.lang.KTopLevelProperty': FqName@223) = null
     packageFragments('java.lang.KTopLevelVariable': FqName@224) = null
     packageFragments('java.lang.String': FqName@225) = null
-    packageFragments('kotlin': FqName@226) = LazyJavaPackageFragment@81['kotlin']
+    packageFragments('kotlin': FqName@226) = LazyJavaPackageFragment@82['kotlin']
     packageFragments('kotlin.Int': FqName@227) = null
     packageFragments('kotlin.KCallable': FqName@228) = null
     packageFragments('kotlin.KMutableProperty': FqName@229) = null
@@ -480,17 +467,15 @@ LazyJavaPackageFragment@201['<root>'] {
     classes('KTopLevelProperty': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@275
     classes('KTopLevelVariable': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@275
     classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@275
     classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@275
     classes('kotlin': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@275
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@275
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@275
     classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@275
     classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@275
     deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@275
-    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
     functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
     functions('kotlin': Name@290) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
-    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
+    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
     functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
     functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@275
     memberIndex = computeMemberIndex$1@291 // through LazyPackageFragmentScopeForJavaPackage@275
@@ -499,208 +484,431 @@ LazyJavaPackageFragment@201['<root>'] {
 LazyJavaPackageFragment@238['io'] {
     classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@292
     classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@292
     classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@292
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@292
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@292
     classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@292
     classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@292
     deserializedPackageScope = DeserializedPackageMemberScope@293 // through LazyPackageFragmentScopeForJavaPackage@292
-    functions('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
     functions('invoke': Name@285) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
     functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
-    functions('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
+    functions('set': Name@31) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
     functions('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
     functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
     functions('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
     functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@292
     memberIndex = computeMemberIndex$1@294 // through LazyPackageFragmentScopeForJavaPackage@292
     membersProtos = LinkedHashMap@295 // through DeserializedPackageMemberScope@293
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
-    properties('name': Name@28) = ArrayList@296[1] { DeserializedPropertyDescriptor@297['name'] } // through DeserializedPackageMemberScope@293
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
+    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
     properties('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
     properties('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@293
 }
 
 LazyJavaPackageFragment@213['java'] {
-    classes('lang': Name@298) = null // through LazyPackageFragmentScopeForJavaPackage@299
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@299
-    functions('lang': Name@300) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@299
-    memberIndex = computeMemberIndex$1@301 // through LazyPackageFragmentScopeForJavaPackage@299
+    classes('lang': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@297
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@297
+    functions('lang': Name@298) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@297
+    memberIndex = computeMemberIndex$1@299 // through LazyPackageFragmentScopeForJavaPackage@297
 }
 
 LazyJavaPackageFragment@250['jvm'] {
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@302
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@302
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@302
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@302
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@302
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@302
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@302
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@302
-    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
-    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@302
-    memberIndex = computeMemberIndex$1@303 // through LazyPackageFragmentScopeForJavaPackage@302
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@300
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@300
+    memberIndex = computeMemberIndex$1@301 // through LazyPackageFragmentScopeForJavaPackage@300
 }
 
-LazyJavaPackageFragment@81['kotlin'] {
-    classes('Any': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('MutableMap': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('Unit': Name@307) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('io': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('jvm': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('reflect': Name@310) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@305
-    deserializedPackageScope = DeserializedPackageMemberScope@311 // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('get': Name@23) = ArrayList@312[2] { DeserializedSimpleFunctionDescriptor@313['get'], DeserializedSimpleFunctionDescriptor@314['get'] } // through DeserializedPackageMemberScope@311
-    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('invoke': Name@285) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('io': Name@315) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    functions('io': Name@315) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('jvm': Name@316) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    functions('jvm': Name@316) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('reflect': Name@317) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    functions('reflect': Name@317) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('set': Name@26) = ArrayList@318[1] { DeserializedSimpleFunctionDescriptor@319['set'] } // through DeserializedPackageMemberScope@311
-    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    functions('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@305
-    memberIndex = computeMemberIndex$1@320 // through LazyPackageFragmentScopeForJavaPackage@305
-    membersProtos = LinkedHashMap@321 // through DeserializedPackageMemberScope@311
-    properties('get': Name@23) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    properties('io': Name@315) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    properties('jvm': Name@316) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    properties('name': Name@28) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    properties('reflect': Name@317) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    properties('set': Name@26) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    properties('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
-    properties('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@311
+LazyJavaPackageFragment@82['kotlin'] {
+    classes('Any': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('MutableMap': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Unit': Name@305) = DeserializedClassDescriptor@20['Unit'] // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('io': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('jvm': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('reflect': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    deserializedPackageScope = DeserializedPackageMemberScope@309 // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('invoke': Name@285) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('io': Name@310) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    functions('io': Name@310) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('jvm': Name@311) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    functions('jvm': Name@311) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('reflect': Name@312) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    functions('reflect': Name@312) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('set': Name@31) = ArrayList@313[1] { DeserializedSimpleFunctionDescriptor@314['set'] } // through DeserializedPackageMemberScope@309
+    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    memberIndex = computeMemberIndex$1@315 // through LazyPackageFragmentScopeForJavaPackage@303
+    membersProtos = LinkedHashMap@316 // through DeserializedPackageMemberScope@309
+    properties('io': Name@310) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    properties('jvm': Name@311) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    properties('reflect': Name@312) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    properties('set': Name@31) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    properties('x': Name@287) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
+    properties('y': Name@288) = EmptyList@24[empty] // through DeserializedPackageMemberScope@309
 }
 
 LazyJavaPackageFragment@215['lang'] {
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@322
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@322
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@322
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@322
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@322
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@322
-    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
-    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@322
-    memberIndex = computeMemberIndex$1@323 // through LazyPackageFragmentScopeForJavaPackage@322
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    memberIndex = computeMemberIndex$1@318 // through LazyPackageFragmentScopeForJavaPackage@317
 }
 
 LazyJavaPackageFragment@21['reflect'] {
-    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KCallable': Name@325) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KMutableProperty': Name@326) = DeserializedClassDescriptor@4['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KMutableTopLevelProperty': Name@278) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KMutableTopLevelVariable': Name@327) = DeserializedClassDescriptor@8['KMutableTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KMutableVariable': Name@328) = DeserializedClassDescriptor@10['KMutableVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KProperty': Name@329) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KTopLevelProperty': Name@330) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KTopLevelVariable': Name@331) = DeserializedClassDescriptor@16['KTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('KVariable': Name@332) = DeserializedClassDescriptor@18['KVariable'] // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('get': Name@23) = null // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('set': Name@26) = null // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@324
-    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@324
-    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@324
-    functions('get': Name@23) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
-    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
-    functions('set': Name@26) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
-    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
-    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@324
-    memberIndex = computeMemberIndex$1@333 // through LazyPackageFragmentScopeForJavaPackage@324
+    classes('Int': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KCallable': Name@320) = DeserializedClassDescriptor@2['KCallable'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KMutableProperty': Name@321) = DeserializedClassDescriptor@4['KMutableProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KMutableTopLevelProperty': Name@278) = DeserializedClassDescriptor@6['KMutableTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KMutableTopLevelVariable': Name@322) = DeserializedClassDescriptor@8['KMutableTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KMutableVariable': Name@323) = DeserializedClassDescriptor@10['KMutableVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KProperty': Name@324) = DeserializedClassDescriptor@12['KProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KTopLevelProperty': Name@325) = DeserializedClassDescriptor@14['KTopLevelProperty'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KTopLevelVariable': Name@326) = DeserializedClassDescriptor@16['KTopLevelVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('KVariable': Name@327) = DeserializedClassDescriptor@18['KVariable'] // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('String': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('invoke': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('set': Name@31) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('x': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    classes('y': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@319
+    deserializedPackageScope = Empty@289 // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('invoke': Name@285) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('set': Name@31) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('x': Name@287) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    functions('y': Name@288) = EmptyList@24[empty] // through LazyPackageFragmentScopeForJavaPackage@319
+    memberIndex = computeMemberIndex$1@328 // through LazyPackageFragmentScopeForJavaPackage@319
 }
 
-NestedClassDescriptors@334 {
+NestedClassDescriptors@329 {
     findNestedClass('get': Name@23) = null
     findNestedClass('name': Name@28) = null
     findNestedClass('set': Name@26) = null
 }
 
-NestedClassDescriptors@335 {
+NestedClassDescriptors@330 {
     findNestedClass('get': Name@196) = null
     findNestedClass('name': Name@197) = null
-    findNestedClass('set': Name@198) = null
+    findNestedClass('set': Name@31) = null
 }
 
-TypeDeserializer@336 {
-    classDescriptors('102': Integer@337) = DeserializedClassDescriptor@338['MutableMap']
-    classDescriptors('2': Integer@339) = DeserializedClassDescriptor@340['Any']
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
-TypeDeserializer@341 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@2['KCallable']
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
-TypeDeserializer@344 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@12['KProperty']
+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]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
 }
 
-TypeDeserializer@345 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@12['KProperty']
+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]
 }
 
-TypeDeserializer@346 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@14['KTopLevelProperty']
-    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@4['KMutableProperty']
+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]
 }
 
-TypeDeserializer@348 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@16['KTopLevelVariable']
-    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@10['KMutableVariable']
-    classDescriptors('6': Integer@349) = DeserializedClassDescriptor@6['KMutableTopLevelProperty']
+ResolutionTaskHolder@351 {
+    <name not found> = ArrayList@352[1] { ResolutionCandidate@353 }
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@353 }
 }
 
-TypeDeserializer@350 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@4['KMutableProperty']
+ResolutionTaskHolder@355 {
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@357 }
+    <name not found> = ArrayList@358[1] { ResolutionCandidate@357 }
 }
 
-TypeDeserializer@351 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@18['KVariable']
-    classDescriptors('5': Integer@347) = DeserializedClassDescriptor@14['KTopLevelProperty']
+ResolutionTaskHolder@359 {
+    <name not found> = ArrayList@360[1] { ResolutionCandidate@361 }
+    <name not found> = ArrayList@362[1] { ResolutionCandidate@361 }
 }
 
-TypeDeserializer@352 {
-    classDescriptors('3': Integer@342) = DeserializedClassDescriptor@340['Any']
+ResolutionTaskHolder@363 {
+    <name not found> = ArrayList@364[1] { ResolutionCandidate@365 }
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@365 }
 }
 
-TypeDeserializer@353 {
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@12['KProperty']
+ResolutionTaskHolder@367 {
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@369 }
+    <name not found> = ArrayList@370[1] { ResolutionCandidate@369 }
 }
 
-TypeDeserializer@354 {
-    classDescriptors('4': Integer@343) = DeserializedClassDescriptor@355['String']
+ResolutionTaskHolder@371 {
+    <name not found> = ArrayList@372[1] { ResolutionCandidate@373 }
+    <name not found> = ArrayList@374[1] { ResolutionCandidate@373 }
 }
 
-TypeDeserializer@356 {
-    classDescriptors('6': Integer@349) = DeserializedClassDescriptor@20['Unit']
+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[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]
+    <name not found> = EmptyList@24[empty]
+    <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@448 {
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <name not found> = EmptyList@24[empty]
+    <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 e323a4262cc..d7590b21220 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/callableReference/unused.lazy.log
@@ -106,7 +106,6 @@ LazyJavaPackageFragment@43['io'] {
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@56
     membersProtos = LinkedHashMap@59 // through DeserializedPackageMemberScope@57
     properties('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
-    properties('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
     properties('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@57
 }
 
@@ -151,7 +150,6 @@ LazyJavaPackageFragment@11['kotlin'] {
     memberIndex = computeMemberIndex$1@75 // through LazyPackageFragmentScopeForJavaPackage@66
     membersProtos = LinkedHashMap@76 // through DeserializedPackageMemberScope@72
     properties('A': Name@49) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
-    properties('bar': Name@51) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
     properties('foo': Name@52) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
     properties('io': Name@73) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
     properties('jvm': Name@74) = EmptyList@54[empty] // through DeserializedPackageMemberScope@72
@@ -174,22 +172,243 @@ LazyJavaPackageFragment@12['reflect'] {
     classes('KMemberFunction0': Name@82) = DeserializedClassDescriptor@10['KMemberFunction0'] // through LazyPackageFragmentScopeForJavaPackage@80
 }
 
-TypeDeserializer@83 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+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]
 }
 
-TypeDeserializer@86 {
-    classDescriptors('2': Integer@84) = DeserializedClassDescriptor@85['Any']
+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]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
 }
 
-TypeDeserializer@87 {
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@91 {
+    <name not found> = ArrayList@92[1] { ResolutionCandidate@93 }
+    <name not found> = ArrayList@94[1] { ResolutionCandidate@93 }
+    <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@89 {
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@2['ExtensionFunction0']
+ResolutionTaskHolder@95 {
+    <name not found> = ArrayList@96[1] { ResolutionCandidate@97 }
+    <name not found> = ArrayList@98[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]
 }
 
-TypeDeserializer@90 {
-    classDescriptors('4': Integer@88) = DeserializedClassDescriptor@4['Function0']
+ResolutionTaskHolder@99 {
+    <name not found> = ArrayList@100[1] { ResolutionCandidate@101 }
+    <name not found> = ArrayList@102[1] { ResolutionCandidate@101 }
+}
+
+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]
+    <name not found> = EmptyList@54[empty]
+    <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 {
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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 {
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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 {
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <name not found> = EmptyList@54[empty]
+    <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]
+}
+
+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]
+}
+
+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]
+}
+
+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]
+}
+
+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@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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
index 1638c8b9e75..e943cc25ddf 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/delegatedProperty.lazy.log
@@ -43,7 +43,6 @@ DeserializedClassDescriptor@8['ReadWriteProperty'] {
     functions('get': Name@30) = ArrayList@31[1] { DeserializedSimpleFunctionDescriptor@32['get'] } // through DeserializedClassMemberScope@33
     functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedClassMemberScope@33
     membersProtos = LinkedHashMap@35 // through DeserializedClassMemberScope@33
-    properties('get': Name@30) = EmptyList@17[empty] // through DeserializedClassMemberScope@33
     properties('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedClassMemberScope@33
     thisAsReceiverParameter = LazyClassReceiverParameterDescriptor@36['<this>']
 }
@@ -78,34 +77,34 @@ DeserializedType@53['T in kotlin.properties.ReadWriteProperty'] {
     constructor = AbstractLazyTypeParameterDescriptor$1@44
 }
 
-DeserializedType@54['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@55
-    memberScope = DeserializedClassMemberScope@56
-}
-
 DeserializedType@46['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@55
-    memberScope = DeserializedClassMemberScope@56
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = DeserializedClassMemberScope@55
 }
 
-DeserializedType@57['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@55
-    memberScope = DeserializedClassMemberScope@56
-}
-
-DeserializedType@41['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@55
-    memberScope = DeserializedClassMemberScope@56
-}
-
-DeserializedType@58['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@55
-    memberScope = DeserializedClassMemberScope@56
+DeserializedType@56['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = DeserializedClassMemberScope@55
 }
 
 DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@55
-    memberScope = DeserializedClassMemberScope@56
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = DeserializedClassMemberScope@55
+}
+
+DeserializedType@57['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = DeserializedClassMemberScope@55
+}
+
+DeserializedType@58['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = DeserializedClassMemberScope@55
+}
+
+DeserializedType@41['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@54
+    memberScope = DeserializedClassMemberScope@55
 }
 
 DeserializedType@59['kotlin.PropertyMetadata'] {
@@ -187,15 +186,11 @@ LazyJavaPackageFragment@77['<root>'] {
     classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@112
     classes('ReadWriteProperty': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@112
     classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@112
     classes('kotlin': Name@117) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('notNull': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@112
     classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@112
     deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@112
     functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('get': Name@30) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     functions('kotlin': Name@119) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('notNull': Name@12) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@112
     memberIndex = computeMemberIndex$1@120 // through LazyPackageFragmentScopeForJavaPackage@112
 }
@@ -204,24 +199,16 @@ LazyJavaPackageFragment@97['io'] {
     classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@121
     classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@121
     classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@121
-    classes('notNull': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@121
     classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@121
     deserializedPackageScope = DeserializedPackageMemberScope@122 // through LazyPackageFragmentScopeForJavaPackage@121
     functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
     functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('get': Name@30) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    functions('get': Name@30) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@121
-    functions('notNull': Name@12) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    functions('notNull': Name@12) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@121
     functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
     functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@121
     memberIndex = computeMemberIndex$1@123 // through LazyPackageFragmentScopeForJavaPackage@121
     membersProtos = LinkedHashMap@124 // through DeserializedPackageMemberScope@122
     properties('Delegates': Name@125) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
     properties('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    properties('get': Name@30) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
-    properties('notNull': Name@12) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
     properties('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@122
 }
 
@@ -236,13 +223,9 @@ LazyJavaPackageFragment@103['jvm'] {
     classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@130
     classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@130
     classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@130
-    classes('notNull': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@130
     classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@130
     deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@130
     functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('get': Name@30) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@130
-    functions('notNull': Name@12) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@130
     functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@130
     memberIndex = computeMemberIndex$1@131 // through LazyPackageFragmentScopeForJavaPackage@130
 }
@@ -252,105 +235,235 @@ LazyJavaPackageFragment@27['kotlin'] {
     classes('PropertyMetadata': Name@133) = DeserializedClassDescriptor@4['PropertyMetadata'] // through LazyPackageFragmentScopeForJavaPackage@132
     classes('PropertyMetadataImpl': Name@114) = DeserializedClassDescriptor@6['PropertyMetadataImpl'] // through LazyPackageFragmentScopeForJavaPackage@132
     classes('String': Name@116) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@132
     classes('io': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@132
     classes('jvm': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('notNull': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@132
     classes('properties': Name@136) = null // through LazyPackageFragmentScopeForJavaPackage@132
     classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@132
     deserializedPackageScope = DeserializedPackageMemberScope@137 // through LazyPackageFragmentScopeForJavaPackage@132
     functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
     functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('get': Name@30) = ArrayList@138[2] { DeserializedSimpleFunctionDescriptor@139['get'], DeserializedSimpleFunctionDescriptor@140['get'] } // through DeserializedPackageMemberScope@137
-    functions('get': Name@30) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('io': Name@141) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('io': Name@141) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('jvm': Name@142) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('jvm': Name@142) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('notNull': Name@12) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('notNull': Name@12) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    functions('properties': Name@143) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    functions('properties': Name@143) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('io': Name@138) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
+    functions('io': Name@138) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('jvm': Name@139) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
+    functions('jvm': Name@139) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('properties': Name@140) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
+    functions('properties': Name@140) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
     functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
     functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@132
-    membersProtos = LinkedHashMap@145 // through DeserializedPackageMemberScope@137
+    memberIndex = computeMemberIndex$1@141 // through LazyPackageFragmentScopeForJavaPackage@132
+    membersProtos = LinkedHashMap@142 // through DeserializedPackageMemberScope@137
     properties('Delegates': Name@125) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
     properties('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('get': Name@30) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('io': Name@141) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('jvm': Name@142) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('notNull': Name@12) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
-    properties('properties': Name@143) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
+    properties('io': Name@138) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
+    properties('jvm': Name@139) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
+    properties('properties': Name@140) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
     properties('propertyDelegated': Name@34) = EmptyList@17[empty] // through DeserializedPackageMemberScope@137
 }
 
 LazyJavaPackageFragment@86['lang'] {
-    classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('get': Name@30) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('notNull': Name@12) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('get': Name@30) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('notNull': Name@12) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    memberIndex = computeMemberIndex$1@147 // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('PropertyMetadataImpl': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@143
+    classes('propertyDelegated': Name@34) = null // through LazyPackageFragmentScopeForJavaPackage@143
+    deserializedPackageScope = Empty@118 // through LazyPackageFragmentScopeForJavaPackage@143
+    functions('PropertyMetadataImpl': Name@114) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@143
+    functions('propertyDelegated': Name@34) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@143
+    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@143
 }
 
 LazyJavaPackageFragment@19['properties'] {
-    classes('Delegates': Name@148) = DeserializedClassDescriptor@2['Delegates'] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('ReadWriteProperty': Name@150) = DeserializedClassDescriptor@8['ReadWriteProperty'] // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = DeserializedPackageMemberScope@151 // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('Delegates': Name@152) = EmptyList@17[empty] // through DeserializedPackageMemberScope@151
-    functions('Delegates': Name@152) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    functions('ReadWriteProperty': Name@153) = EmptyList@17[empty] // through DeserializedPackageMemberScope@151
-    functions('ReadWriteProperty': Name@153) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    memberIndex = computeMemberIndex$1@154 // through LazyPackageFragmentScopeForJavaPackage@149
-    membersProtos = LinkedHashMap@155 // through DeserializedPackageMemberScope@151
-    properties('Delegates': Name@152) = EmptyList@17[empty] // through DeserializedPackageMemberScope@151
-    properties('ReadWriteProperty': Name@153) = EmptyList@17[empty] // through DeserializedPackageMemberScope@151
+    classes('Delegates': Name@145) = DeserializedClassDescriptor@2['Delegates'] // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('ReadWriteProperty': Name@147) = DeserializedClassDescriptor@8['ReadWriteProperty'] // through LazyPackageFragmentScopeForJavaPackage@146
+    deserializedPackageScope = DeserializedPackageMemberScope@148 // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('Delegates': Name@149) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
+    functions('Delegates': Name@149) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('ReadWriteProperty': Name@150) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
+    functions('ReadWriteProperty': Name@150) = EmptyList@17[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    memberIndex = computeMemberIndex$1@151 // through LazyPackageFragmentScopeForJavaPackage@146
+    membersProtos = LinkedHashMap@152 // through DeserializedPackageMemberScope@148
+    properties('Delegates': Name@149) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
+    properties('ReadWriteProperty': Name@150) = EmptyList@17[empty] // through DeserializedPackageMemberScope@148
 }
 
-NestedClassDescriptors@156 {
+NestedClassDescriptors@153 {
     findNestedClass('get': Name@30) = null
     findNestedClass('propertyDelegated': Name@34) = null
 }
 
-NestedClassDescriptors@157 {
+NestedClassDescriptors@154 {
     findNestedClass('notNull': Name@12) = null
 }
 
-NestedClassDescriptors@158 {
+NestedClassDescriptors@155 {
     findNestedClass('notNull': Name@12) = null
 }
 
-TypeDeserializer@159 {
-    classDescriptors('1': Integer@160) = DeserializedClassDescriptor@6['PropertyMetadataImpl']
-    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@162['String']
+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]
+    <name not found> = EmptyList@17[empty]
+    <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@163 {
-    classDescriptors('18': Integer@164) = DeserializedClassDescriptor@8['ReadWriteProperty']
-    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@165['Any']
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@166 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@2['Delegates']
+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]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <name not found> = EmptyList@17[empty]
+    <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@168 {
-    classDescriptors('2': Integer@167) = DeserializedClassDescriptor@4['PropertyMetadata']
+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]
+    <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@169 {
-    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@165['Any']
+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@170 {
-    classDescriptors('3': Integer@161) = DeserializedClassDescriptor@165['Any']
+ResolutionTaskHolder@176 {
+    <name not found> = ArrayList@177[1] { ResolutionCandidate@178 }
+    <name not found> = ArrayList@179[1] { ResolutionCandidate@178 }
 }
 
-TypeDeserializer@171 {
-    classDescriptors('4': Integer@172) = DeserializedClassDescriptor@4['PropertyMetadata']
+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@185 {
+    classDescriptors('1': Integer@186) = DeserializedClassDescriptor@6['PropertyMetadataImpl']
+    classDescriptors('3': Integer@187) = DeserializedClassDescriptor@188['String']
+}
+
+TypeDeserializer@189 {
+    classDescriptors('18': Integer@190) = DeserializedClassDescriptor@8['ReadWriteProperty']
+    classDescriptors('3': Integer@187) = DeserializedClassDescriptor@191['Any']
+}
+
+TypeDeserializer@192 {
+    classDescriptors('2': Integer@193) = DeserializedClassDescriptor@2['Delegates']
+}
+
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
index 5e5cc84b87c..e0c46f9490a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.lazy.log
@@ -88,6 +88,11 @@ LazyJavaPackageFragment@3['platform'] {
     classes('platformName': Name@41) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
-TypeDeserializer@64 {
-    classDescriptors('4': Integer@65) = DeserializedClassDescriptor@66['String']
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
index 5e5cc84b87c..e0c46f9490a 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.lazy.log
@@ -88,6 +88,11 @@ LazyJavaPackageFragment@3['platform'] {
     classes('platformName': Name@41) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@63
 }
 
-TypeDeserializer@64 {
-    classDescriptors('4': Integer@65) = DeserializedClassDescriptor@66['String']
+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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
index 54188dc4d4b..c7139620d3e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.lazy.log
@@ -73,3 +73,13 @@ LazyJavaPackageFragment@3['platform'] {
     functions('platformStatic': Name@57) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@56
     memberIndex = computeMemberIndex$1@58 // through LazyPackageFragmentScopeForJavaPackage@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 }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
index f9c9aabf589..8f2967a43a5 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.lazy.log
@@ -88,3 +88,13 @@ LazyJavaPackageFragment@3['platform'] {
     functions('platformStatic': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@64
     memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
+
+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 }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
index b1d85b976fb..3f83a48828e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/functionLiterals/pseudocodeMemoryOverhead.lazy.log
@@ -1,1230 +1,18233 @@
 ClassDeserializer@0 {
     classes(ClassKey@1) = DeserializedClassDescriptor@2['Function1']
     classes(ClassKey@3) = DeserializedClassDescriptor@4['Function2']
-    classes(ClassKey@5) = DeserializedClassDescriptor@6['InlineOption']
-    classes(ClassKey@7) = DeserializedClassDescriptor@8['Pair']
-    classes(ClassKey@9) = DeserializedClassDescriptor@10['data']
-    classes(ClassKey@11) = DeserializedClassDescriptor@12['deprecated']
-    classes(ClassKey@13) = DeserializedClassDescriptor@14['inline']
-    classes(ClassKey@15) = DeserializedClassDescriptor@16['inlineOptions']
+    classes(ClassKey@5) = DeserializedClassDescriptor@6['Pair']
+    classes(ClassKey@7) = DeserializedClassDescriptor@8['data']
 }
 
-DescriptorLoadersStorage@17 {
-    storage(VirtualFileKotlinClass@18) = Storage@19
-    storage(VirtualFileKotlinClass@20) = Storage@21
-}
-
-DescriptorResolver@22 {
-    <name not found> = JetTypeImpl@23['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@24['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@25['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@26['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@27['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@28['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@29['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@30['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@31['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@32['CompileTimeType<1>']
-    <name not found> = JetTypeImpl@33['Pair<2>']
-    <name not found> = JetTypeImpl@34['Pair<2>']
+DescriptorResolver@9 {
+    <name not found> = JetTypeImpl@10['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@11['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@12['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@13['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@14['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@15['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@16['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@17['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@18['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@19['CompileTimeType<1>']
+    <name not found> = JetTypeImpl@20['Pair<2>']
+    <name not found> = JetTypeImpl@21['Pair<2>']
 }
 
 DeserializedClassDescriptor@2['Function1'] {
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
+    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
 }
 
 DeserializedClassDescriptor@4['Function2'] {
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
+    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
 }
 
-DeserializedClassDescriptor@6['InlineOption'] {
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
-    defaultType = JetTypeImpl@36['InlineOption']
-    unsubstitutedInnerClassesScope = InnerClassesScopeWrapper@37
-}
-
-DeserializedClassDescriptor@8['Pair'] {
+DeserializedClassDescriptor@6['Pair'] {
     classObjectDescriptor = null
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
-    defaultType = JetTypeImpl@38['Pair<2>']
-    primaryConstructor = ConstructorDescriptorImpl@39['<init>']
+    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
+    defaultType = JetTypeImpl@23['Pair<2>']
+    primaryConstructor = ConstructorDescriptorImpl@24['<init>']
 }
 
-DeserializedClassDescriptor@10['data'] {
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
-    primaryConstructor = ConstructorDescriptorImpl@40['<init>']
+DeserializedClassDescriptor@8['data'] {
+    containingDeclaration = LazyJavaPackageFragment@22['kotlin']
+    primaryConstructor = ConstructorDescriptorImpl@25['<init>']
 }
 
-DeserializedClassDescriptor@12['deprecated'] {
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
-    defaultType = JetTypeImpl@41['deprecated']
-    primaryConstructor = ConstructorDescriptorImpl@42['<init>']
+DeserializedTypeParameterDescriptor@26['A'] {
+    defaultType = JetTypeImpl@27['A']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@28
+    upperBounds = LinkedHashSet@29[1] { DeserializedType@30['kotlin.Any'] }
 }
 
-DeserializedClassDescriptor@14['inline'] {
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
-    defaultType = JetTypeImpl@43['inline']
+DeserializedTypeParameterDescriptor@31['A'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@32
+    upperBounds = LinkedHashSet@33[1] { DeserializedType@34['kotlin.Any'] }
+    upperBoundsAsType = DeserializedType@34['kotlin.Any']
 }
 
-DeserializedClassDescriptor@16['inlineOptions'] {
-    containingDeclaration = LazyJavaPackageFragment@35['kotlin']
-    defaultType = JetTypeImpl@44['inlineOptions']
-    primaryConstructor = ConstructorDescriptorImpl@45['<init>']
+DeserializedTypeParameterDescriptor@35['B'] {
+    defaultType = JetTypeImpl@36['B']
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@37
+    upperBounds = LinkedHashSet@38[1] { DeserializedType@39['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@46['A'] {
-    defaultType = JetTypeImpl@47['A']
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@48
-    upperBounds = LinkedHashSet@49[1] { DeserializedType@50['kotlin.Any'] }
+DeserializedTypeParameterDescriptor@40['B'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@41
+    upperBounds = LinkedHashSet@42[1] { DeserializedType@43['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@51['A'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@52
-    upperBounds = LinkedHashSet@53[1] { DeserializedType@54['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@54['kotlin.Any']
+DeserializedTypeParameterDescriptor@44['K'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@45
+    upperBounds = LinkedHashSet@46[1] { DeserializedType@47['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@55['B'] {
-    defaultType = JetTypeImpl@56['B']
+DeserializedTypeParameterDescriptor@48['P1'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@49
+    upperBounds = LinkedHashSet@50[1] { DeserializedType@51['kotlin.Any'] }
+    upperBoundsAsType = DeserializedType@51['kotlin.Any']
+}
+
+DeserializedTypeParameterDescriptor@52['P1'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@53
+    upperBounds = LinkedHashSet@54[1] { DeserializedType@55['kotlin.Any'] }
+    upperBoundsAsType = DeserializedType@55['kotlin.Any']
+}
+
+DeserializedTypeParameterDescriptor@56['P2'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@57
     upperBounds = LinkedHashSet@58[1] { DeserializedType@59['kotlin.Any'] }
+    upperBoundsAsType = DeserializedType@59['kotlin.Any']
 }
 
-DeserializedTypeParameterDescriptor@60['B'] {
+DeserializedTypeParameterDescriptor@60['R'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@61
     upperBounds = LinkedHashSet@62[1] { DeserializedType@63['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@64['K'] {
+DeserializedTypeParameterDescriptor@64['R'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@65
     upperBounds = LinkedHashSet@66[1] { DeserializedType@67['kotlin.Any'] }
 }
 
-DeserializedTypeParameterDescriptor@68['P1'] {
+DeserializedTypeParameterDescriptor@68['V'] {
     typeConstructor = AbstractLazyTypeParameterDescriptor$1@69
     upperBounds = LinkedHashSet@70[1] { DeserializedType@71['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@71['kotlin.Any']
 }
 
-DeserializedTypeParameterDescriptor@72['P1'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@73
-    upperBounds = LinkedHashSet@74[1] { DeserializedType@75['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@75['kotlin.Any']
+DeserializedType@72['A in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@32
 }
 
-DeserializedTypeParameterDescriptor@76['P2'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@77
-    upperBounds = LinkedHashSet@78[1] { DeserializedType@79['kotlin.Any'] }
-    upperBoundsAsType = DeserializedType@79['kotlin.Any']
+DeserializedType@73['A in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@32
 }
 
-DeserializedTypeParameterDescriptor@80['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@81
-    upperBounds = LinkedHashSet@82[1] { DeserializedType@83['kotlin.Any'] }
+DeserializedType@74['A in kotlin.Pair'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@28
 }
 
-DeserializedTypeParameterDescriptor@84['R'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@85
-    upperBounds = LinkedHashSet@86[1] { DeserializedType@87['kotlin.Any'] }
+DeserializedType@75['A in kotlin.Pair'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@28
 }
 
-DeserializedTypeParameterDescriptor@88['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@89
-    upperBounds = LinkedHashSet@90[1] { DeserializedType@91['kotlin.Any'] }
+DeserializedType@76['B in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
-DeserializedType@92['A in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@52
+DeserializedType@77['B in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@41
 }
 
-DeserializedType@93['A in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@52
+DeserializedType@78['B in kotlin.Pair'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@37
 }
 
-DeserializedType@94['A in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+DeserializedType@79['B in kotlin.Pair'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@37
 }
 
-DeserializedType@95['A in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@48
+DeserializedType@80['K in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@45
 }
 
-DeserializedType@96['B in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@61
+DeserializedType@81['K in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@45
 }
 
-DeserializedType@97['B in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@61
+DeserializedType@82['K in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@45
 }
 
-DeserializedType@98['B in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@57
+DeserializedType@83['V in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-DeserializedType@99['B in kotlin.Pair'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@57
+DeserializedType@84['V in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-DeserializedType@100['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
+DeserializedType@85['V in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@69
 }
 
-DeserializedType@101['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
+DeserializedType@86['java.io.Serializable'] {
+    constructor = LazyJavaClassTypeConstructor@87['Serializable']
 }
 
-DeserializedType@102['K in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@65
+DeserializedType@88['java.util.HashMap'] {
+    constructor = LazyJavaClassTypeConstructor@89['HashMap']
+    memberScope = SubstitutingScope@90
 }
 
-DeserializedType@103['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@89
+DeserializedType@39['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@104['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@89
-}
-
-DeserializedType@105['V in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@89
-}
-
-DeserializedType@106['java.io.Serializable'] {
-    constructor = LazyJavaClassTypeConstructor@107['Serializable']
-}
-
-DeserializedType@108['java.util.HashMap'] {
-    constructor = LazyJavaClassTypeConstructor@109['HashMap']
-    memberScope = SubstitutingScope@110
-}
-
-DeserializedType@54['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@71['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@113['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@59['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@83['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
-}
-
-DeserializedType@79['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+DeserializedType@55['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
 DeserializedType@67['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@50['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+DeserializedType@34['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@87['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+DeserializedType@59['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@91['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+DeserializedType@30['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@75['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+DeserializedType@93['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@114['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+DeserializedType@43['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
+}
+
+DeserializedType@71['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
 DeserializedType@63['kotlin.Any'] {
-    constructor = DeserializedClassTypeConstructor@111
-    memberScope = DeserializedClassMemberScope@112
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@115['kotlin.Array'] {
-    constructor = DeserializedClassTypeConstructor@116
-    memberScope = SubstitutingScope@117
+DeserializedType@47['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@118['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@119
-    memberScope = SubstitutingScope@120
+DeserializedType@51['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@121['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@119
-    memberScope = SubstitutingScope@122
+DeserializedType@94['kotlin.Any'] {
+    constructor = DeserializedClassTypeConstructor@91
+    memberScope = DeserializedClassMemberScope@92
 }
 
-DeserializedType@123['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@119
-    memberScope = SubstitutingScope@124
+DeserializedType@95['kotlin.Array'] {
+    constructor = DeserializedClassTypeConstructor@96
+    memberScope = SubstitutingScope@97
 }
 
-DeserializedType@125['kotlin.Pair'] {
-    constructor = DeserializedClassTypeConstructor@119
-    memberScope = SubstitutingScope@126
+DeserializedType@98['kotlin.Pair'] {
+    constructor = DeserializedClassTypeConstructor@99
+    memberScope = SubstitutingScope@100
 }
 
-EnumEntryClassDescriptors@127 {
-    findEnumEntry('ONLY_LOCAL_RETURN': Name@128) = EnumEntrySyntheticClassDescriptor@129['ONLY_LOCAL_RETURN']
+DeserializedType@101['kotlin.Pair'] {
+    constructor = DeserializedClassTypeConstructor@99
+    memberScope = SubstitutingScope@102
 }
 
-EnumEntrySyntheticClassDescriptor@130['<class-object-for-ONLY_LOCAL_RETURN>'] {
-    defaultType = JetTypeImpl@131['enum entry']
+DeserializedType@103['kotlin.Pair'] {
+    constructor = DeserializedClassTypeConstructor@99
+    memberScope = SubstitutingScope@104
 }
 
-EnumEntrySyntheticClassDescriptor@129['ONLY_LOCAL_RETURN'] {
-    defaultType = JetTypeImpl@132['enum entry']
+DeserializedType@105['kotlin.Pair'] {
+    constructor = DeserializedClassTypeConstructor@99
+    memberScope = SubstitutingScope@106
 }
 
-LazyAnnotationDescriptor@133 {
-    resolutionResults = OverloadResolutionResultsImpl@134
-    type = JetTypeImpl@135['data']
+LazyAnnotationDescriptor@107 {
+    resolutionResults = OverloadResolutionResultsImpl@108
+    type = JetTypeImpl@109['data']
 }
 
-LazyAnnotationDescriptor@136 {
-    resolutionResults = OverloadResolutionResultsImpl@137
-    type = JetTypeImpl@138['data']
+LazyAnnotationDescriptor@110 {
+    resolutionResults = OverloadResolutionResultsImpl@111
+    type = JetTypeImpl@112['data']
 }
 
-LazyJavaClassDescriptor@139['HashMap'] {
+LazyJavaClassDescriptor@113['HashMap'] {
     functionTypeForSamInterface = null
-    typeConstructor = LazyJavaClassTypeConstructor@109['HashMap']
+    typeConstructor = LazyJavaClassTypeConstructor@89['HashMap']
 }
 
-LazyJavaClassDescriptor@140['Serializable'] {
-    typeConstructor = LazyJavaClassTypeConstructor@107['Serializable']
+LazyJavaClassDescriptor@114['Serializable'] {
+    typeConstructor = LazyJavaClassTypeConstructor@87['Serializable']
 }
 
-LazyJavaClassTypeConstructor@109['HashMap'] {
-    parameters = ArrayList@141[2] { LazyJavaTypeParameterDescriptor@142['K'], LazyJavaTypeParameterDescriptor@143['V'] }
+LazyJavaClassTypeConstructor@89['HashMap'] {
+    parameters = ArrayList@115[2] { LazyJavaTypeParameterDescriptor@116['K'], LazyJavaTypeParameterDescriptor@117['V'] }
 }
 
-LazyJavaClassTypeConstructor@107['Serializable'] {
-    parameters = ArrayList@144[empty]
-    supertypes = ArrayList@145[1] { JetTypeImpl@146['Any'] }
+LazyJavaClassTypeConstructor@87['Serializable'] {
+    parameters = ArrayList@118[empty]
+    supertypes = ArrayList@119[1] { JetTypeImpl@120['Any'] }
 }
 
-LazyJavaClassifierType@147['Object'] {
-    classifier = JavaClassImpl@148['Object']
-    typeConstructor = DeserializedClassTypeConstructor@111
+LazyJavaClassifierType@121['Object'] {
+    classifier = JavaClassImpl@122['Object']
+    typeConstructor = DeserializedClassTypeConstructor@91
 }
 
-LazyJavaPackageFragmentProvider@149 {
-    packageFragments('<root>': FqName@150) = LazyJavaPackageFragment@151['<root>']
-    packageFragments('A': FqName@152) = null
-    packageFragments('ANY': FqName@153) = null
-    packageFragments('Any': FqName@154) = null
-    packageFragments('B': FqName@155) = null
-    packageFragments('BOOLEAN': FqName@156) = null
-    packageFragments('BYTE': FqName@157) = null
-    packageFragments('BigInteger': FqName@158) = null
-    packageFragments('BinaryOperationKey': FqName@159) = null
-    packageFragments('Boolean': FqName@160) = null
-    packageFragments('Byte': FqName@161) = null
-    packageFragments('CHAR': FqName@162) = null
-    packageFragments('Char': FqName@163) = null
-    packageFragments('CompileTimeType': FqName@164) = null
-    packageFragments('DOUBLE': FqName@165) = null
-    packageFragments('Double': FqName@166) = null
-    packageFragments('FLOAT': FqName@167) = null
-    packageFragments('Float': FqName@168) = null
-    packageFragments('Function1': FqName@169) = null
-    packageFragments('Function2': FqName@170) = null
-    packageFragments('HashMap': FqName@171) = null
-    packageFragments('INT': FqName@172) = null
-    packageFragments('Int': FqName@173) = null
-    packageFragments('LONG': FqName@174) = null
-    packageFragments('Long': FqName@175) = null
-    packageFragments('Pair': FqName@176) = null
-    packageFragments('SHORT': FqName@177) = null
-    packageFragments('STRING': FqName@178) = null
-    packageFragments('Short': FqName@179) = null
-    packageFragments('String': FqName@180) = null
-    packageFragments('UnaryOperationKey': FqName@181) = null
-    packageFragments('binaryOperations': FqName@182) = null
-    packageFragments('data': FqName@183) = null
-    packageFragments('emptyBinaryFun': FqName@184) = null
-    packageFragments('emptyUnaryFun': FqName@185) = null
-    packageFragments('java': FqName@186) = LazyJavaPackageFragment@187['java']
-    packageFragments('java.io': FqName@188) = LazyJavaPackageFragment@189['io']
-    packageFragments('java.lang': FqName@190) = LazyJavaPackageFragment@191['lang']
-    packageFragments('java.lang.A': FqName@192) = null
-    packageFragments('java.lang.Any': FqName@193) = null
-    packageFragments('java.lang.B': FqName@194) = null
-    packageFragments('java.lang.BigInteger': FqName@195) = null
-    packageFragments('java.lang.BinaryOperationKey': FqName@196) = null
-    packageFragments('java.lang.Boolean': FqName@197) = null
-    packageFragments('java.lang.Byte': FqName@198) = null
-    packageFragments('java.lang.Char': FqName@199) = null
-    packageFragments('java.lang.CompileTimeType': FqName@200) = null
-    packageFragments('java.lang.Double': FqName@201) = null
-    packageFragments('java.lang.Float': FqName@202) = null
-    packageFragments('java.lang.Function1': FqName@203) = null
-    packageFragments('java.lang.Function2': FqName@204) = null
-    packageFragments('java.lang.HashMap': FqName@205) = null
-    packageFragments('java.lang.Int': FqName@206) = null
-    packageFragments('java.lang.Long': FqName@207) = null
-    packageFragments('java.lang.Pair': FqName@208) = null
-    packageFragments('java.lang.Short': FqName@209) = null
-    packageFragments('java.lang.String': FqName@210) = null
-    packageFragments('java.lang.UnaryOperationKey': FqName@211) = null
-    packageFragments('java.lang.data': FqName@212) = null
-    packageFragments('java.util': FqName@213) = LazyJavaPackageFragment@214['util']
-    packageFragments('java.util.HashMap': FqName@215) = null
-    packageFragments('kotlin': FqName@216) = LazyJavaPackageFragment@35['kotlin']
-    packageFragments('kotlin.A': FqName@217) = null
-    packageFragments('kotlin.Any': FqName@218) = null
-    packageFragments('kotlin.B': FqName@219) = null
-    packageFragments('kotlin.BigInteger': FqName@220) = null
-    packageFragments('kotlin.BinaryOperationKey': FqName@221) = null
-    packageFragments('kotlin.Boolean': FqName@222) = null
-    packageFragments('kotlin.Byte': FqName@223) = null
-    packageFragments('kotlin.Char': FqName@224) = null
-    packageFragments('kotlin.CompileTimeType': FqName@225) = null
-    packageFragments('kotlin.Double': FqName@226) = null
-    packageFragments('kotlin.Float': FqName@227) = null
-    packageFragments('kotlin.Function1': FqName@228) = null
-    packageFragments('kotlin.Function2': FqName@229) = null
-    packageFragments('kotlin.HashMap': FqName@230) = null
-    packageFragments('kotlin.Int': FqName@231) = null
-    packageFragments('kotlin.Long': FqName@232) = null
-    packageFragments('kotlin.Pair': FqName@233) = null
-    packageFragments('kotlin.Short': FqName@234) = null
-    packageFragments('kotlin.String': FqName@235) = null
-    packageFragments('kotlin.UnaryOperationKey': FqName@236) = null
-    packageFragments('kotlin.data': FqName@237) = null
-    packageFragments('kotlin.io': FqName@238) = LazyJavaPackageFragment@239['io']
-    packageFragments('kotlin.io.A': FqName@240) = null
-    packageFragments('kotlin.io.Any': FqName@241) = null
-    packageFragments('kotlin.io.B': FqName@242) = null
-    packageFragments('kotlin.io.BigInteger': FqName@243) = null
-    packageFragments('kotlin.io.BinaryOperationKey': FqName@244) = null
-    packageFragments('kotlin.io.Boolean': FqName@245) = null
-    packageFragments('kotlin.io.Byte': FqName@246) = null
-    packageFragments('kotlin.io.Char': FqName@247) = null
-    packageFragments('kotlin.io.CompileTimeType': FqName@248) = null
-    packageFragments('kotlin.io.Double': FqName@249) = null
-    packageFragments('kotlin.io.Float': FqName@250) = null
-    packageFragments('kotlin.io.Function1': FqName@251) = null
-    packageFragments('kotlin.io.Function2': FqName@252) = null
-    packageFragments('kotlin.io.HashMap': FqName@253) = null
-    packageFragments('kotlin.io.Int': FqName@254) = null
-    packageFragments('kotlin.io.Long': FqName@255) = null
-    packageFragments('kotlin.io.Pair': FqName@256) = null
-    packageFragments('kotlin.io.Short': FqName@257) = null
-    packageFragments('kotlin.io.String': FqName@258) = null
-    packageFragments('kotlin.io.UnaryOperationKey': FqName@259) = null
-    packageFragments('kotlin.io.data': FqName@260) = null
-    packageFragments('kotlin.jvm': FqName@261) = LazyJavaPackageFragment@262['jvm']
-    packageFragments('kotlin.jvm.A': FqName@263) = null
-    packageFragments('kotlin.jvm.Any': FqName@264) = null
-    packageFragments('kotlin.jvm.B': FqName@265) = null
-    packageFragments('kotlin.jvm.BigInteger': FqName@266) = null
-    packageFragments('kotlin.jvm.BinaryOperationKey': FqName@267) = null
-    packageFragments('kotlin.jvm.Boolean': FqName@268) = null
-    packageFragments('kotlin.jvm.Byte': FqName@269) = null
-    packageFragments('kotlin.jvm.Char': FqName@270) = null
-    packageFragments('kotlin.jvm.CompileTimeType': FqName@271) = null
-    packageFragments('kotlin.jvm.Double': FqName@272) = null
-    packageFragments('kotlin.jvm.Float': FqName@273) = null
-    packageFragments('kotlin.jvm.Function1': FqName@274) = null
-    packageFragments('kotlin.jvm.Function2': FqName@275) = null
-    packageFragments('kotlin.jvm.HashMap': FqName@276) = null
-    packageFragments('kotlin.jvm.Int': FqName@277) = null
-    packageFragments('kotlin.jvm.Long': FqName@278) = null
-    packageFragments('kotlin.jvm.Pair': FqName@279) = null
-    packageFragments('kotlin.jvm.Short': FqName@280) = null
-    packageFragments('kotlin.jvm.String': FqName@281) = null
-    packageFragments('kotlin.jvm.UnaryOperationKey': FqName@282) = null
-    packageFragments('kotlin.jvm.data': FqName@283) = null
-    packageFragments('unaryOperations': FqName@284) = null
-    topLevelClasses(JavaClassImpl@285['HashMap']) = LazyJavaClassDescriptor@139['HashMap']
-    topLevelClasses(JavaClassImpl@286['Serializable']) = LazyJavaClassDescriptor@140['Serializable']
+LazyJavaPackageFragmentProvider@123 {
+    packageFragments('<root>': FqName@124) = LazyJavaPackageFragment@125['<root>']
+    packageFragments('A': FqName@126) = null
+    packageFragments('ANY': FqName@127) = null
+    packageFragments('Any': FqName@128) = null
+    packageFragments('B': FqName@129) = null
+    packageFragments('BOOLEAN': FqName@130) = null
+    packageFragments('BYTE': FqName@131) = null
+    packageFragments('BigInteger': FqName@132) = null
+    packageFragments('BinaryOperationKey': FqName@133) = null
+    packageFragments('Boolean': FqName@134) = null
+    packageFragments('Byte': FqName@135) = null
+    packageFragments('CHAR': FqName@136) = null
+    packageFragments('Char': FqName@137) = null
+    packageFragments('CompileTimeType': FqName@138) = null
+    packageFragments('DOUBLE': FqName@139) = null
+    packageFragments('Double': FqName@140) = null
+    packageFragments('FLOAT': FqName@141) = null
+    packageFragments('Float': FqName@142) = null
+    packageFragments('Function1': FqName@143) = null
+    packageFragments('Function2': FqName@144) = null
+    packageFragments('HashMap': FqName@145) = null
+    packageFragments('INT': FqName@146) = null
+    packageFragments('Int': FqName@147) = null
+    packageFragments('LONG': FqName@148) = null
+    packageFragments('Long': FqName@149) = null
+    packageFragments('Pair': FqName@150) = null
+    packageFragments('SHORT': FqName@151) = null
+    packageFragments('STRING': FqName@152) = null
+    packageFragments('Short': FqName@153) = null
+    packageFragments('String': FqName@154) = null
+    packageFragments('UnaryOperationKey': FqName@155) = null
+    packageFragments('binaryOperations': FqName@156) = null
+    packageFragments('data': FqName@157) = null
+    packageFragments('emptyBinaryFun': FqName@158) = null
+    packageFragments('emptyUnaryFun': FqName@159) = null
+    packageFragments('java': FqName@160) = LazyJavaPackageFragment@161['java']
+    packageFragments('java.io': FqName@162) = LazyJavaPackageFragment@163['io']
+    packageFragments('java.lang': FqName@164) = LazyJavaPackageFragment@165['lang']
+    packageFragments('java.lang.A': FqName@166) = null
+    packageFragments('java.lang.Any': FqName@167) = null
+    packageFragments('java.lang.B': FqName@168) = null
+    packageFragments('java.lang.BigInteger': FqName@169) = null
+    packageFragments('java.lang.BinaryOperationKey': FqName@170) = null
+    packageFragments('java.lang.Boolean': FqName@171) = null
+    packageFragments('java.lang.Byte': FqName@172) = null
+    packageFragments('java.lang.Char': FqName@173) = null
+    packageFragments('java.lang.CompileTimeType': FqName@174) = null
+    packageFragments('java.lang.Double': FqName@175) = null
+    packageFragments('java.lang.Float': FqName@176) = null
+    packageFragments('java.lang.Function1': FqName@177) = null
+    packageFragments('java.lang.Function2': FqName@178) = null
+    packageFragments('java.lang.HashMap': FqName@179) = null
+    packageFragments('java.lang.Int': FqName@180) = null
+    packageFragments('java.lang.Long': FqName@181) = null
+    packageFragments('java.lang.Pair': FqName@182) = null
+    packageFragments('java.lang.Short': FqName@183) = null
+    packageFragments('java.lang.String': FqName@184) = null
+    packageFragments('java.lang.UnaryOperationKey': FqName@185) = null
+    packageFragments('java.lang.data': FqName@186) = null
+    packageFragments('java.util': FqName@187) = LazyJavaPackageFragment@188['util']
+    packageFragments('java.util.HashMap': FqName@189) = null
+    packageFragments('kotlin': FqName@190) = LazyJavaPackageFragment@22['kotlin']
+    packageFragments('kotlin.A': FqName@191) = null
+    packageFragments('kotlin.Any': FqName@192) = null
+    packageFragments('kotlin.B': FqName@193) = null
+    packageFragments('kotlin.BigInteger': FqName@194) = null
+    packageFragments('kotlin.BinaryOperationKey': FqName@195) = null
+    packageFragments('kotlin.Boolean': FqName@196) = null
+    packageFragments('kotlin.Byte': FqName@197) = null
+    packageFragments('kotlin.Char': FqName@198) = null
+    packageFragments('kotlin.CompileTimeType': FqName@199) = null
+    packageFragments('kotlin.Double': FqName@200) = null
+    packageFragments('kotlin.Float': FqName@201) = null
+    packageFragments('kotlin.Function1': FqName@202) = null
+    packageFragments('kotlin.Function2': FqName@203) = null
+    packageFragments('kotlin.HashMap': FqName@204) = null
+    packageFragments('kotlin.Int': FqName@205) = null
+    packageFragments('kotlin.Long': FqName@206) = null
+    packageFragments('kotlin.Pair': FqName@207) = null
+    packageFragments('kotlin.Short': FqName@208) = null
+    packageFragments('kotlin.String': FqName@209) = null
+    packageFragments('kotlin.UnaryOperationKey': FqName@210) = null
+    packageFragments('kotlin.data': FqName@211) = null
+    packageFragments('kotlin.io': FqName@212) = LazyJavaPackageFragment@213['io']
+    packageFragments('kotlin.io.A': FqName@214) = null
+    packageFragments('kotlin.io.Any': FqName@215) = null
+    packageFragments('kotlin.io.B': FqName@216) = null
+    packageFragments('kotlin.io.BigInteger': FqName@217) = null
+    packageFragments('kotlin.io.BinaryOperationKey': FqName@218) = null
+    packageFragments('kotlin.io.Boolean': FqName@219) = null
+    packageFragments('kotlin.io.Byte': FqName@220) = null
+    packageFragments('kotlin.io.Char': FqName@221) = null
+    packageFragments('kotlin.io.CompileTimeType': FqName@222) = null
+    packageFragments('kotlin.io.Double': FqName@223) = null
+    packageFragments('kotlin.io.Float': FqName@224) = null
+    packageFragments('kotlin.io.Function1': FqName@225) = null
+    packageFragments('kotlin.io.Function2': FqName@226) = null
+    packageFragments('kotlin.io.HashMap': FqName@227) = null
+    packageFragments('kotlin.io.Int': FqName@228) = null
+    packageFragments('kotlin.io.Long': FqName@229) = null
+    packageFragments('kotlin.io.Pair': FqName@230) = null
+    packageFragments('kotlin.io.Short': FqName@231) = null
+    packageFragments('kotlin.io.String': FqName@232) = null
+    packageFragments('kotlin.io.UnaryOperationKey': FqName@233) = null
+    packageFragments('kotlin.io.data': FqName@234) = null
+    packageFragments('kotlin.jvm': FqName@235) = LazyJavaPackageFragment@236['jvm']
+    packageFragments('kotlin.jvm.A': FqName@237) = null
+    packageFragments('kotlin.jvm.Any': FqName@238) = null
+    packageFragments('kotlin.jvm.B': FqName@239) = null
+    packageFragments('kotlin.jvm.BigInteger': FqName@240) = null
+    packageFragments('kotlin.jvm.BinaryOperationKey': FqName@241) = null
+    packageFragments('kotlin.jvm.Boolean': FqName@242) = null
+    packageFragments('kotlin.jvm.Byte': FqName@243) = null
+    packageFragments('kotlin.jvm.Char': FqName@244) = null
+    packageFragments('kotlin.jvm.CompileTimeType': FqName@245) = null
+    packageFragments('kotlin.jvm.Double': FqName@246) = null
+    packageFragments('kotlin.jvm.Float': FqName@247) = null
+    packageFragments('kotlin.jvm.Function1': FqName@248) = null
+    packageFragments('kotlin.jvm.Function2': FqName@249) = null
+    packageFragments('kotlin.jvm.HashMap': FqName@250) = null
+    packageFragments('kotlin.jvm.Int': FqName@251) = null
+    packageFragments('kotlin.jvm.Long': FqName@252) = null
+    packageFragments('kotlin.jvm.Pair': FqName@253) = null
+    packageFragments('kotlin.jvm.Short': FqName@254) = null
+    packageFragments('kotlin.jvm.String': FqName@255) = null
+    packageFragments('kotlin.jvm.UnaryOperationKey': FqName@256) = null
+    packageFragments('kotlin.jvm.data': FqName@257) = null
+    packageFragments('unaryOperations': FqName@258) = null
+    topLevelClasses(JavaClassImpl@259['HashMap']) = LazyJavaClassDescriptor@113['HashMap']
+    topLevelClasses(JavaClassImpl@260['Serializable']) = LazyJavaClassDescriptor@114['Serializable']
 }
 
-LazyJavaPackageFragment@151['<root>'] {
-    classes('ANY': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Any': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('BOOLEAN': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('BYTE': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('BigInteger': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('BinaryOperationKey': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Boolean': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Byte': Name@295) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('CHAR': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Char': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('CompileTimeType': Name@298) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('DOUBLE': Name@299) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Double': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('FLOAT': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Float': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Function1': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Function2': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('HashMap': Name@305) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('INT': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Int': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('LONG': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Long': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Pair': Name@310) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('SHORT': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('STRING': Name@312) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('Short': Name@313) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('String': Name@314) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('UnaryOperationKey': Name@315) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('add': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('and': Name@317) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('binaryOperation': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('compareTo': Name@319) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('data': Name@320) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('div': Name@321) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('divide': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('emptyBinaryFun': Name@323) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('emptyUnaryFun': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('equals': Name@325) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('get': Name@326) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('hashMapOf': Name@327) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('inv': Name@328) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('java': Name@329) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('minus': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('mod': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('multiply': Name@332) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('not': Name@333) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('or': Name@334) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('plus': Name@335) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('shl': Name@336) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('shr': Name@337) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('subtract': Name@338) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('times': Name@339) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('to': Name@340) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toByte': Name@341) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toChar': Name@342) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toDouble': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toFloat': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toInt': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toLong': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toShort': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('toString': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('unaryOperation': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('ushr': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    classes('xor': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@288
-    deserializedPackageScope = Empty@352 // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('BigInteger': Name@292) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('CompileTimeType': Name@298) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('Pair': Name@354) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('add': Name@316) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('and': Name@317) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('binaryOperation': Name@318) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('compareTo': Name@319) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('div': Name@321) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('divide': Name@322) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('equals': Name@325) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('get': Name@326) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('hashMapOf': Name@327) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('inv': Name@328) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('java': Name@355) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('minus': Name@330) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('mod': Name@331) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('multiply': Name@332) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('not': Name@333) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('or': Name@334) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('plus': Name@335) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('shl': Name@336) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('shr': Name@337) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('subtract': Name@338) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('times': Name@339) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('to': Name@340) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toByte': Name@341) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toChar': Name@342) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toDouble': Name@343) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toFloat': Name@344) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toInt': Name@345) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toLong': Name@346) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toShort': Name@347) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('toString': Name@348) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('unaryOperation': Name@349) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('ushr': Name@350) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    functions('xor': Name@351) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@288
-    memberIndex = computeMemberIndex$1@356 // through LazyPackageFragmentScopeForJavaPackage@288
+LazyJavaPackageFragment@125['<root>'] {
+    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Function1': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Function2': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('HashMap': Name@279) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Pair': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('data': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('java': Name@295) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@262
+    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('java': Name@301) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@262
+    memberIndex = computeMemberIndex$1@302 // through LazyPackageFragmentScopeForJavaPackage@262
 }
 
-LazyJavaPackageFragment@239['io'] {
-    classes('ANY': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Any': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('BOOLEAN': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('BYTE': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('BigInteger': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('BinaryOperationKey': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Boolean': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Byte': Name@295) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('CHAR': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Char': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('CompileTimeType': Name@298) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('DOUBLE': Name@299) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Double': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('FLOAT': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Float': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Function1': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Function2': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('INT': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Int': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('LONG': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Long': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Pair': Name@310) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('SHORT': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('STRING': Name@312) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('Short': Name@313) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('String': Name@314) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('UnaryOperationKey': Name@315) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('add': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('and': Name@317) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('binaryOperation': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('compareTo': Name@319) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('data': Name@320) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('div': Name@321) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('divide': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('emptyBinaryFun': Name@323) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('emptyUnaryFun': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('equals': Name@325) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('get': Name@326) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('hashMapOf': Name@327) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('inv': Name@328) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('minus': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('mod': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('multiply': Name@332) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('not': Name@333) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('or': Name@334) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('plus': Name@335) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('shl': Name@336) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('shr': Name@337) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('subtract': Name@338) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('times': Name@339) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('to': Name@340) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toByte': Name@341) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toChar': Name@342) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toDouble': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toFloat': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toInt': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toLong': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toShort': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('toString': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('unaryOperation': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('ushr': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    classes('xor': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@357
-    deserializedPackageScope = DeserializedPackageMemberScope@358 // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('BigInteger': Name@292) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('BigInteger': Name@292) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('CompileTimeType': Name@298) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('CompileTimeType': Name@298) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('Pair': Name@354) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('Pair': Name@354) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('add': Name@316) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('add': Name@316) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('and': Name@317) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('and': Name@317) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('binaryOperation': Name@318) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('binaryOperation': Name@318) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('compareTo': Name@319) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('compareTo': Name@319) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('div': Name@321) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('div': Name@321) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('divide': Name@322) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('divide': Name@322) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('equals': Name@325) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('equals': Name@325) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('get': Name@326) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('get': Name@326) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('hashMapOf': Name@327) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('hashMapOf': Name@327) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('inv': Name@328) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('inv': Name@328) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('minus': Name@330) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('minus': Name@330) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('mod': Name@331) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('mod': Name@331) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('multiply': Name@332) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('multiply': Name@332) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('not': Name@333) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('not': Name@333) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('or': Name@334) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('or': Name@334) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('plus': Name@335) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('plus': Name@335) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('shl': Name@336) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('shl': Name@336) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('shr': Name@337) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('shr': Name@337) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('subtract': Name@338) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('subtract': Name@338) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('times': Name@339) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('times': Name@339) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('to': Name@340) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('to': Name@340) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toByte': Name@341) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toByte': Name@341) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toChar': Name@342) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toChar': Name@342) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toDouble': Name@343) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toDouble': Name@343) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toFloat': Name@344) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toFloat': Name@344) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toInt': Name@345) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toInt': Name@345) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toLong': Name@346) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toLong': Name@346) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toShort': Name@347) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toShort': Name@347) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('toString': Name@348) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('toString': Name@348) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('unaryOperation': Name@349) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('unaryOperation': Name@349) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('ushr': Name@350) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('ushr': Name@350) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    functions('xor': Name@351) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    functions('xor': Name@351) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@357
-    memberIndex = computeMemberIndex$1@359 // through LazyPackageFragmentScopeForJavaPackage@357
-    membersProtos = LinkedHashMap@360 // through DeserializedPackageMemberScope@358
-    properties('ANY': Name@287) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('BOOLEAN': Name@290) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('BYTE': Name@291) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('BigInteger': Name@292) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('CHAR': Name@296) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('CompileTimeType': Name@298) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('DOUBLE': Name@299) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('FLOAT': Name@301) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('INT': Name@306) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('LONG': Name@308) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('Pair': Name@354) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('SHORT': Name@311) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('STRING': Name@312) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('add': Name@316) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('and': Name@317) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('binaryOperation': Name@318) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('compareTo': Name@319) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('div': Name@321) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('divide': Name@322) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('emptyBinaryFun': Name@323) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('emptyUnaryFun': Name@324) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('equals': Name@325) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('get': Name@326) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('hashMapOf': Name@327) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('inv': Name@328) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('minus': Name@330) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('mod': Name@331) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('multiply': Name@332) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('not': Name@333) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('o': Name@361) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('or': Name@334) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('plus': Name@335) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('shl': Name@336) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('shr': Name@337) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('subtract': Name@338) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('times': Name@339) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('to': Name@340) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toByte': Name@341) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toChar': Name@342) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toDouble': Name@343) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toFloat': Name@344) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toInt': Name@345) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toLong': Name@346) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toShort': Name@347) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('toString': Name@348) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('unaryOperation': Name@349) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('ushr': Name@350) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
-    properties('xor': Name@351) = EmptyList@353[empty] // through DeserializedPackageMemberScope@358
+LazyJavaPackageFragment@213['io'] {
+    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Function1': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Function2': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Pair': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('data': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@303
+    deserializedPackageScope = DeserializedPackageMemberScope@304 // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('to': Name@296) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@303
+    memberIndex = computeMemberIndex$1@305 // through LazyPackageFragmentScopeForJavaPackage@303
+    membersProtos = LinkedHashMap@306 // through DeserializedPackageMemberScope@304
+    properties('ANY': Name@261) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('BOOLEAN': Name@264) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('BYTE': Name@265) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('CHAR': Name@270) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('DOUBLE': Name@273) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('FLOAT': Name@275) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('INT': Name@280) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('LONG': Name@282) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('SHORT': Name@285) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('STRING': Name@286) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('emptyBinaryFun': Name@292) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('emptyUnaryFun': Name@293) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('hashMapOf': Name@294) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
+    properties('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@304
 }
 
-LazyJavaPackageFragment@189['io'] {
-    classes('Serializable': Name@362) = LazyJavaClassDescriptor@140['Serializable'] // through LazyPackageFragmentScopeForJavaPackage@363
+LazyJavaPackageFragment@163['io'] {
+    classes('Serializable': Name@307) = LazyJavaClassDescriptor@114['Serializable'] // through LazyPackageFragmentScopeForJavaPackage@308
 }
 
-LazyJavaPackageFragment@187['java'] {
-    classes('lang': Name@364) = null // through LazyPackageFragmentScopeForJavaPackage@365
-    classes('util': Name@366) = null // through LazyPackageFragmentScopeForJavaPackage@365
-    deserializedPackageScope = Empty@352 // through LazyPackageFragmentScopeForJavaPackage@365
-    functions('lang': Name@367) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@365
-    functions('util': Name@368) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@365
-    memberIndex = computeMemberIndex$1@369 // through LazyPackageFragmentScopeForJavaPackage@365
+LazyJavaPackageFragment@161['java'] {
+    classes('lang': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@310
+    classes('util': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@310
+    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@310
+    functions('lang': Name@312) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@310
+    functions('util': Name@313) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@310
+    memberIndex = computeMemberIndex$1@314 // through LazyPackageFragmentScopeForJavaPackage@310
 }
 
-LazyJavaPackageFragment@262['jvm'] {
-    classes('ANY': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Any': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('BOOLEAN': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('BYTE': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('BigInteger': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('BinaryOperationKey': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Boolean': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Byte': Name@295) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('CHAR': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Char': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('CompileTimeType': Name@298) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('DOUBLE': Name@299) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Double': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('FLOAT': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Float': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Function1': Name@303) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Function2': Name@304) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('INT': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Int': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('LONG': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Long': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Pair': Name@310) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('SHORT': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('STRING': Name@312) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('Short': Name@313) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('String': Name@314) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('UnaryOperationKey': Name@315) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('add': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('and': Name@317) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('binaryOperation': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('compareTo': Name@319) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('data': Name@320) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('div': Name@321) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('divide': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('emptyBinaryFun': Name@323) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('emptyUnaryFun': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('equals': Name@325) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('get': Name@326) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('hashMapOf': Name@327) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('inv': Name@328) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('minus': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('mod': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('multiply': Name@332) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('not': Name@333) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('or': Name@334) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('plus': Name@335) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('shl': Name@336) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('shr': Name@337) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('subtract': Name@338) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('times': Name@339) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('to': Name@340) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toByte': Name@341) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toChar': Name@342) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toDouble': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toFloat': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toInt': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toLong': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toShort': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('toString': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('unaryOperation': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('ushr': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    classes('xor': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@370
-    deserializedPackageScope = Empty@352 // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('BigInteger': Name@292) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('CompileTimeType': Name@298) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('Pair': Name@354) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('add': Name@316) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('and': Name@317) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('binaryOperation': Name@318) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('compareTo': Name@319) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('div': Name@321) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('divide': Name@322) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('equals': Name@325) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('get': Name@326) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('hashMapOf': Name@327) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('inv': Name@328) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('minus': Name@330) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('mod': Name@331) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('multiply': Name@332) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('not': Name@333) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('or': Name@334) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('plus': Name@335) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('shl': Name@336) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('shr': Name@337) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('subtract': Name@338) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('times': Name@339) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('to': Name@340) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toByte': Name@341) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toChar': Name@342) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toDouble': Name@343) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toFloat': Name@344) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toInt': Name@345) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toLong': Name@346) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toShort': Name@347) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('toString': Name@348) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('unaryOperation': Name@349) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('ushr': Name@350) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    functions('xor': Name@351) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@370
-    memberIndex = computeMemberIndex$1@371 // through LazyPackageFragmentScopeForJavaPackage@370
+LazyJavaPackageFragment@236['jvm'] {
+    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Function1': Name@277) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Function2': Name@278) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Pair': Name@284) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('data': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@315
+    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@315
+    memberIndex = computeMemberIndex$1@316 // through LazyPackageFragmentScopeForJavaPackage@315
 }
 
-LazyJavaPackageFragment@35['kotlin'] {
-    classes('ANY': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Any': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Array': Name@373) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('BOOLEAN': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('BYTE': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('BigInteger': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('BinaryOperationKey': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Boolean': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Byte': Name@295) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('CHAR': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Char': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('CompileTimeType': Name@298) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('DOUBLE': Name@299) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Double': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('FLOAT': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Float': Name@302) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Function1': Name@303) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Function2': Name@304) = DeserializedClassDescriptor@4['Function2'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('INT': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('InlineOption': Name@374) = DeserializedClassDescriptor@6['InlineOption'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Int': Name@307) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('LONG': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Long': Name@309) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Pair': Name@310) = DeserializedClassDescriptor@8['Pair'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('SHORT': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('STRING': Name@312) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('Short': Name@313) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('String': Name@314) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('UnaryOperationKey': Name@315) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('add': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('and': Name@317) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('binaryOperation': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('compareTo': Name@319) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('data': Name@320) = DeserializedClassDescriptor@10['data'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('deprecated': Name@375) = DeserializedClassDescriptor@12['deprecated'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('div': Name@321) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('divide': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('emptyBinaryFun': Name@323) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('emptyUnaryFun': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('equals': Name@325) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('get': Name@326) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('hashMapOf': Name@327) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('inline': Name@376) = DeserializedClassDescriptor@14['inline'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('inlineOptions': Name@377) = DeserializedClassDescriptor@16['inlineOptions'] // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('inv': Name@328) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('io': Name@378) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('jvm': Name@379) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('minus': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('mod': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('multiply': Name@332) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('not': Name@333) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('or': Name@334) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('plus': Name@335) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('shl': Name@336) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('shr': Name@337) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('subtract': Name@338) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('times': Name@339) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('to': Name@340) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toByte': Name@341) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toChar': Name@342) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toDouble': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toFloat': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toInt': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toLong': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toShort': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('toString': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('unaryOperation': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('ushr': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    classes('xor': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@372
-    deserializedPackageScope = DeserializedPackageMemberScope@380 // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('BigInteger': Name@292) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('BigInteger': Name@292) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('CompileTimeType': Name@298) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('CompileTimeType': Name@298) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('Pair': Name@354) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('Pair': Name@354) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('add': Name@316) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('add': Name@316) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('and': Name@317) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('and': Name@317) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('binaryOperation': Name@318) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('binaryOperation': Name@318) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('compareTo': Name@319) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('compareTo': Name@319) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('div': Name@321) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('div': Name@321) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('divide': Name@322) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('divide': Name@322) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('equals': Name@325) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('equals': Name@325) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('get': Name@326) = ArrayList@381[2] { DeserializedSimpleFunctionDescriptor@382['get'], DeserializedSimpleFunctionDescriptor@383['get'] } // through DeserializedPackageMemberScope@380
-    functions('get': Name@326) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('hashMapOf': Name@327) = ArrayList@384[1] { DeserializedSimpleFunctionDescriptor@385['hashMapOf'] } // through DeserializedPackageMemberScope@380
-    functions('hashMapOf': Name@327) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('inv': Name@328) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('inv': Name@328) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('io': Name@386) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('io': Name@386) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('jvm': Name@387) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('jvm': Name@387) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('minus': Name@330) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('minus': Name@330) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('mod': Name@331) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('mod': Name@331) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('multiply': Name@332) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('multiply': Name@332) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('not': Name@333) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('not': Name@333) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('or': Name@334) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('or': Name@334) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('plus': Name@335) = ArrayList@388[37] { DeserializedSimpleFunctionDescriptor@389['plus'], DeserializedSimpleFunctionDescriptor@390['plus'], DeserializedSimpleFunctionDescriptor@391['plus'], ... } // through DeserializedPackageMemberScope@380
-    functions('plus': Name@335) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('shl': Name@336) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('shl': Name@336) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('shr': Name@337) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('shr': Name@337) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('subtract': Name@338) = ArrayList@392[10] { DeserializedSimpleFunctionDescriptor@393['subtract'], DeserializedSimpleFunctionDescriptor@394['subtract'], DeserializedSimpleFunctionDescriptor@395['subtract'], ... } // through DeserializedPackageMemberScope@380
-    functions('subtract': Name@338) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('times': Name@339) = ArrayList@396[1] { DeserializedSimpleFunctionDescriptor@397['times'] } // through DeserializedPackageMemberScope@380
-    functions('times': Name@339) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('to': Name@340) = ArrayList@398[1] { DeserializedSimpleFunctionDescriptor@399['to'] } // through DeserializedPackageMemberScope@380
-    functions('to': Name@340) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toByte': Name@341) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('toByte': Name@341) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toChar': Name@342) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('toChar': Name@342) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toDouble': Name@343) = ArrayList@400[1] { DeserializedSimpleFunctionDescriptor@401['toDouble'] } // through DeserializedPackageMemberScope@380
-    functions('toDouble': Name@343) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toFloat': Name@344) = ArrayList@402[1] { DeserializedSimpleFunctionDescriptor@403['toFloat'] } // through DeserializedPackageMemberScope@380
-    functions('toFloat': Name@344) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toInt': Name@345) = ArrayList@404[1] { DeserializedSimpleFunctionDescriptor@405['toInt'] } // through DeserializedPackageMemberScope@380
-    functions('toInt': Name@345) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toLong': Name@346) = ArrayList@406[1] { DeserializedSimpleFunctionDescriptor@407['toLong'] } // through DeserializedPackageMemberScope@380
-    functions('toLong': Name@346) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toShort': Name@347) = ArrayList@408[1] { DeserializedSimpleFunctionDescriptor@409['toShort'] } // through DeserializedPackageMemberScope@380
-    functions('toShort': Name@347) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('toString': Name@348) = ArrayList@410[3] { DeserializedSimpleFunctionDescriptor@411['toString'], DeserializedSimpleFunctionDescriptor@412['toString'], DeserializedSimpleFunctionDescriptor@413['toString'] } // through DeserializedPackageMemberScope@380
-    functions('toString': Name@348) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('unaryOperation': Name@349) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('unaryOperation': Name@349) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('ushr': Name@350) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('ushr': Name@350) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    functions('xor': Name@351) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    functions('xor': Name@351) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@372
-    memberIndex = computeMemberIndex$1@414 // through LazyPackageFragmentScopeForJavaPackage@372
-    membersProtos = LinkedHashMap@415 // through DeserializedPackageMemberScope@380
-    properties('ANY': Name@287) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('BOOLEAN': Name@290) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('BYTE': Name@291) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('BigInteger': Name@292) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('CHAR': Name@296) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('CompileTimeType': Name@298) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('DOUBLE': Name@299) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('FLOAT': Name@301) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('INT': Name@306) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('LONG': Name@308) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('Pair': Name@354) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('SHORT': Name@311) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('STRING': Name@312) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('add': Name@316) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('and': Name@317) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('binaryOperation': Name@318) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('compareTo': Name@319) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('div': Name@321) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('divide': Name@322) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('emptyBinaryFun': Name@323) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('emptyUnaryFun': Name@324) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('equals': Name@325) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('get': Name@326) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('hashMapOf': Name@327) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('inv': Name@328) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('io': Name@386) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('jvm': Name@387) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('minus': Name@330) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('mod': Name@331) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('multiply': Name@332) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('not': Name@333) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('o': Name@361) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('or': Name@334) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('plus': Name@335) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('shl': Name@336) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('shr': Name@337) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('subtract': Name@338) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('times': Name@339) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('to': Name@340) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toByte': Name@341) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toChar': Name@342) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toDouble': Name@343) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toFloat': Name@344) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toInt': Name@345) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toLong': Name@346) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toShort': Name@347) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('toString': Name@348) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('unaryOperation': Name@349) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('ushr': Name@350) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
-    properties('xor': Name@351) = EmptyList@353[empty] // through DeserializedPackageMemberScope@380
+LazyJavaPackageFragment@22['kotlin'] {
+    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Any': Name@263) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Array': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Boolean': Name@268) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Byte': Name@269) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Char': Name@271) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Double': Name@274) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Float': Name@276) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Function1': Name@277) = DeserializedClassDescriptor@2['Function1'] // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Function2': Name@278) = DeserializedClassDescriptor@4['Function2'] // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Int': Name@281) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Long': Name@283) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Pair': Name@284) = DeserializedClassDescriptor@6['Pair'] // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('Short': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('String': Name@288) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('data': Name@291) = DeserializedClassDescriptor@8['data'] // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('io': Name@319) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('jvm': Name@320) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@317
+    deserializedPackageScope = DeserializedPackageMemberScope@321 // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('hashMapOf': Name@294) = ArrayList@322[1] { DeserializedSimpleFunctionDescriptor@323['hashMapOf'] } // through DeserializedPackageMemberScope@321
+    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('io': Name@324) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('io': Name@324) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('jvm': Name@325) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('jvm': Name@325) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('to': Name@296) = ArrayList@326[1] { DeserializedSimpleFunctionDescriptor@327['to'] } // through DeserializedPackageMemberScope@321
+    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@317
+    memberIndex = computeMemberIndex$1@328 // through LazyPackageFragmentScopeForJavaPackage@317
+    membersProtos = LinkedHashMap@329 // through DeserializedPackageMemberScope@321
+    properties('ANY': Name@261) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('BOOLEAN': Name@264) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('BYTE': Name@265) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('BigInteger': Name@266) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('CHAR': Name@270) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('CompileTimeType': Name@272) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('DOUBLE': Name@273) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('FLOAT': Name@275) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('INT': Name@280) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('LONG': Name@282) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('Pair': Name@300) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('SHORT': Name@285) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('STRING': Name@286) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('binaryOperation': Name@290) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('emptyBinaryFun': Name@292) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('emptyUnaryFun': Name@293) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('hashMapOf': Name@294) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('io': Name@324) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('jvm': Name@325) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
+    properties('unaryOperation': Name@297) = EmptyList@299[empty] // through DeserializedPackageMemberScope@321
 }
 
-LazyJavaPackageFragment@191['lang'] {
-    classes('ANY': Name@287) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('BOOLEAN': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('BYTE': Name@291) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('BigInteger': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('BinaryOperationKey': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('CHAR': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('CompileTimeType': Name@298) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('DOUBLE': Name@299) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('FLOAT': Name@301) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('INT': Name@306) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('LONG': Name@308) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('Pair': Name@354) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('SHORT': Name@311) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('STRING': Name@312) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('UnaryOperationKey': Name@315) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('add': Name@316) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('and': Name@317) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('binaryOperation': Name@318) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('compareTo': Name@319) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('div': Name@321) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('divide': Name@322) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('emptyBinaryFun': Name@323) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('emptyUnaryFun': Name@324) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('equals': Name@325) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('get': Name@326) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('hashMapOf': Name@327) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('inv': Name@328) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('minus': Name@330) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('mod': Name@331) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('multiply': Name@332) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('not': Name@333) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('or': Name@334) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('plus': Name@335) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('shl': Name@336) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('shr': Name@337) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('subtract': Name@338) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('times': Name@339) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('to': Name@340) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toByte': Name@341) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toChar': Name@342) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toDouble': Name@343) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toFloat': Name@344) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toInt': Name@345) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toLong': Name@346) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toShort': Name@347) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('toString': Name@348) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('unaryOperation': Name@349) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('ushr': Name@350) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    classes('xor': Name@351) = null // through LazyPackageFragmentScopeForJavaPackage@416
-    deserializedPackageScope = Empty@352 // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('BigInteger': Name@292) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('BinaryOperationKey': Name@293) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('CompileTimeType': Name@298) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('Pair': Name@354) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('UnaryOperationKey': Name@315) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('add': Name@316) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('and': Name@317) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('binaryOperation': Name@318) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('compareTo': Name@319) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('div': Name@321) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('divide': Name@322) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('equals': Name@325) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('get': Name@326) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('hashMapOf': Name@327) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('inv': Name@328) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('minus': Name@330) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('mod': Name@331) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('multiply': Name@332) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('not': Name@333) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('or': Name@334) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('plus': Name@335) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('shl': Name@336) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('shr': Name@337) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('subtract': Name@338) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('times': Name@339) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('to': Name@340) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toByte': Name@341) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toChar': Name@342) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toDouble': Name@343) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toFloat': Name@344) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toInt': Name@345) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toLong': Name@346) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toShort': Name@347) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('toString': Name@348) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('unaryOperation': Name@349) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('ushr': Name@350) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    functions('xor': Name@351) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@416
-    memberIndex = computeMemberIndex$1@417 // through LazyPackageFragmentScopeForJavaPackage@416
+LazyJavaPackageFragment@165['lang'] {
+    classes('ANY': Name@261) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('BOOLEAN': Name@264) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('BYTE': Name@265) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('BigInteger': Name@266) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('BinaryOperationKey': Name@267) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('CHAR': Name@270) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('CompileTimeType': Name@272) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('DOUBLE': Name@273) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('FLOAT': Name@275) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('INT': Name@280) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('LONG': Name@282) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('Pair': Name@300) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('SHORT': Name@285) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('STRING': Name@286) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('UnaryOperationKey': Name@289) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('binaryOperation': Name@290) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('emptyBinaryFun': Name@292) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('emptyUnaryFun': Name@293) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('hashMapOf': Name@294) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('to': Name@296) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    classes('unaryOperation': Name@297) = null // through LazyPackageFragmentScopeForJavaPackage@330
+    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('BigInteger': Name@266) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('BinaryOperationKey': Name@267) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('CompileTimeType': Name@272) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('Pair': Name@300) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('UnaryOperationKey': Name@289) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('binaryOperation': Name@290) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('hashMapOf': Name@294) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('to': Name@296) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    functions('unaryOperation': Name@297) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@330
+    memberIndex = computeMemberIndex$1@331 // through LazyPackageFragmentScopeForJavaPackage@330
 }
 
-LazyJavaPackageFragment@214['util'] {
-    classes('HashMap': Name@418) = LazyJavaClassDescriptor@139['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@419
-    deserializedPackageScope = Empty@352 // through LazyPackageFragmentScopeForJavaPackage@419
-    functions('HashMap': Name@420) = EmptyList@353[empty] // through LazyPackageFragmentScopeForJavaPackage@419
-    memberIndex = computeMemberIndex$1@421 // through LazyPackageFragmentScopeForJavaPackage@419
+LazyJavaPackageFragment@188['util'] {
+    classes('HashMap': Name@332) = LazyJavaClassDescriptor@113['HashMap'] // through LazyPackageFragmentScopeForJavaPackage@333
+    deserializedPackageScope = Empty@298 // through LazyPackageFragmentScopeForJavaPackage@333
+    functions('HashMap': Name@334) = EmptyList@299[empty] // through LazyPackageFragmentScopeForJavaPackage@333
+    memberIndex = computeMemberIndex$1@335 // through LazyPackageFragmentScopeForJavaPackage@333
 }
 
-LazyJavaTypeParameterDescriptor@142['K'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@422
-    upperBounds = LinkedHashSet@423[1] { NullableType@424 }
+LazyJavaTypeParameterDescriptor@116['K'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@336
+    upperBounds = LinkedHashSet@337[1] { NullableType@338 }
 }
 
-LazyJavaTypeParameterDescriptor@143['V'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@425
-    upperBounds = LinkedHashSet@426[1] { NullableType@427 }
+LazyJavaTypeParameterDescriptor@117['V'] {
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@339
+    upperBounds = LinkedHashSet@340[1] { NullableType@341 }
 }
 
-LazyJavaTypeParameterResolver@428 {
-    resolve(JavaTypeParameterImpl@429['K']) = LazyJavaTypeParameterDescriptor@142['K']
-    resolve(JavaTypeParameterImpl@430['V']) = LazyJavaTypeParameterDescriptor@143['V']
+LazyJavaTypeParameterResolver@342 {
+    resolve(JavaTypeParameterImpl@343['K']) = LazyJavaTypeParameterDescriptor@116['K']
+    resolve(JavaTypeParameterImpl@344['V']) = LazyJavaTypeParameterDescriptor@117['V']
 }
 
-TypeDeserializer@431 {
-    classDescriptors('1': Integer@432) = DeserializedClassDescriptor@8['Pair']
+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]
 }
 
-TypeDeserializer@433 {
-    classDescriptors('117': Integer@434) = DeserializedClassDescriptor@8['Pair']
-    classDescriptors('118': Integer@435) = LazyJavaClassDescriptor@139['HashMap']
-    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
-    classDescriptors('3': Integer@438) = DeserializedClassDescriptor@439['Array']
+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]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
 }
 
-TypeDeserializer@440 {
-    classDescriptors('117': Integer@434) = DeserializedClassDescriptor@8['Pair']
-    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
+ResolutionTaskHolder@353 {
+    <name not found> = ArrayList@354[1] { ResolutionCandidate@355 }
+    <name not found> = ArrayList@356[1] { ResolutionCandidate@355 }
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
 }
 
-TypeDeserializer@441 {
-    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
-    classDescriptors('5': Integer@442) = LazyJavaClassDescriptor@140['Serializable']
+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]
 }
 
-TypeDeserializer@443 {
-    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
+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]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
 }
 
-TypeDeserializer@444 {
-    classDescriptors('2': Integer@436) = DeserializedClassDescriptor@437['Any']
+ResolutionTaskHolder@365 {
+    <name not found> = ArrayList@366[1] { ResolutionCandidate@367 }
+    <name not found> = ArrayList@368[1] { ResolutionCandidate@367 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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 }
+    <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@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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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]
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1961 {
+    <name not found> = ArrayList@1962[1] { ResolutionCandidate@1963 }
+    <name not found> = ArrayList@1964[1] { ResolutionCandidate@1963 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1973 {
+    <name not found> = ArrayList@1974[1] { ResolutionCandidate@1975 }
+    <name not found> = ArrayList@1976[1] { ResolutionCandidate@1975 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1985 {
+    <name not found> = ArrayList@1986[1] { ResolutionCandidate@1987 }
+    <name not found> = ArrayList@1988[1] { ResolutionCandidate@1987 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@1997 {
+    <name not found> = ArrayList@1998[1] { ResolutionCandidate@1999 }
+    <name not found> = ArrayList@2000[1] { ResolutionCandidate@1999 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2009 {
+    <name not found> = ArrayList@2010[1] { ResolutionCandidate@2011 }
+    <name not found> = ArrayList@2012[1] { ResolutionCandidate@2011 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2021 {
+    <name not found> = ArrayList@2022[1] { ResolutionCandidate@2023 }
+    <name not found> = ArrayList@2024[1] { ResolutionCandidate@2023 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2033 {
+    <name not found> = ArrayList@2034[1] { ResolutionCandidate@2035 }
+    <name not found> = ArrayList@2036[1] { ResolutionCandidate@2035 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2045 {
+    <name not found> = ArrayList@2046[1] { ResolutionCandidate@2047 }
+    <name not found> = ArrayList@2048[1] { ResolutionCandidate@2047 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2057 {
+    <name not found> = ArrayList@2058[1] { ResolutionCandidate@2059 }
+    <name not found> = ArrayList@2060[1] { ResolutionCandidate@2059 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2069 {
+    <name not found> = ArrayList@2070[1] { ResolutionCandidate@2071 }
+    <name not found> = ArrayList@2072[1] { ResolutionCandidate@2071 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2081 {
+    <name not found> = ArrayList@2082[1] { ResolutionCandidate@2083 }
+    <name not found> = ArrayList@2084[1] { ResolutionCandidate@2083 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2093 {
+    <name not found> = ArrayList@2094[1] { ResolutionCandidate@2095 }
+    <name not found> = ArrayList@2096[1] { ResolutionCandidate@2095 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2105 {
+    <name not found> = ArrayList@2106[1] { ResolutionCandidate@2107 }
+    <name not found> = ArrayList@2108[1] { ResolutionCandidate@2107 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2117 {
+    <name not found> = ArrayList@2118[1] { ResolutionCandidate@2119 }
+    <name not found> = ArrayList@2120[1] { ResolutionCandidate@2119 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2129 {
+    <name not found> = ArrayList@2130[1] { ResolutionCandidate@2131 }
+    <name not found> = ArrayList@2132[1] { ResolutionCandidate@2131 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2141 {
+    <name not found> = ArrayList@2142[1] { ResolutionCandidate@2143 }
+    <name not found> = ArrayList@2144[1] { ResolutionCandidate@2143 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2153 {
+    <name not found> = ArrayList@2154[1] { ResolutionCandidate@2155 }
+    <name not found> = ArrayList@2156[1] { ResolutionCandidate@2155 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2165 {
+    <name not found> = ArrayList@2166[1] { ResolutionCandidate@2167 }
+    <name not found> = ArrayList@2168[1] { ResolutionCandidate@2167 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2177 {
+    <name not found> = ArrayList@2178[1] { ResolutionCandidate@2179 }
+    <name not found> = ArrayList@2180[1] { ResolutionCandidate@2179 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2189 {
+    <name not found> = ArrayList@2190[1] { ResolutionCandidate@2191 }
+    <name not found> = ArrayList@2192[1] { ResolutionCandidate@2191 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2201 {
+    <name not found> = ArrayList@2202[1] { ResolutionCandidate@2203 }
+    <name not found> = ArrayList@2204[1] { ResolutionCandidate@2203 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2213 {
+    <name not found> = ArrayList@2214[1] { ResolutionCandidate@2215 }
+    <name not found> = ArrayList@2216[1] { ResolutionCandidate@2215 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2225 {
+    <name not found> = ArrayList@2226[1] { ResolutionCandidate@2227 }
+    <name not found> = ArrayList@2228[1] { ResolutionCandidate@2227 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2237 {
+    <name not found> = ArrayList@2238[1] { ResolutionCandidate@2239 }
+    <name not found> = ArrayList@2240[1] { ResolutionCandidate@2239 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2249 {
+    <name not found> = ArrayList@2250[1] { ResolutionCandidate@2251 }
+    <name not found> = ArrayList@2252[1] { ResolutionCandidate@2251 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2261 {
+    <name not found> = ArrayList@2262[1] { ResolutionCandidate@2263 }
+    <name not found> = ArrayList@2264[1] { ResolutionCandidate@2263 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2273 {
+    <name not found> = ArrayList@2274[1] { ResolutionCandidate@2275 }
+    <name not found> = ArrayList@2276[1] { ResolutionCandidate@2275 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2285 {
+    <name not found> = ArrayList@2286[1] { ResolutionCandidate@2287 }
+    <name not found> = ArrayList@2288[1] { ResolutionCandidate@2287 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2297 {
+    <name not found> = ArrayList@2298[1] { ResolutionCandidate@2299 }
+    <name not found> = ArrayList@2300[1] { ResolutionCandidate@2299 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2309 {
+    <name not found> = ArrayList@2310[1] { ResolutionCandidate@2311 }
+    <name not found> = ArrayList@2312[1] { ResolutionCandidate@2311 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2321 {
+    <name not found> = ArrayList@2322[1] { ResolutionCandidate@2323 }
+    <name not found> = ArrayList@2324[1] { ResolutionCandidate@2323 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2333 {
+    <name not found> = ArrayList@2334[1] { ResolutionCandidate@2335 }
+    <name not found> = ArrayList@2336[1] { ResolutionCandidate@2335 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2345 {
+    <name not found> = ArrayList@2346[1] { ResolutionCandidate@2347 }
+    <name not found> = ArrayList@2348[1] { ResolutionCandidate@2347 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2357 {
+    <name not found> = ArrayList@2358[1] { ResolutionCandidate@2359 }
+    <name not found> = ArrayList@2360[1] { ResolutionCandidate@2359 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2369 {
+    <name not found> = ArrayList@2370[1] { ResolutionCandidate@2371 }
+    <name not found> = ArrayList@2372[1] { ResolutionCandidate@2371 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2381 {
+    <name not found> = ArrayList@2382[1] { ResolutionCandidate@2383 }
+    <name not found> = ArrayList@2384[1] { ResolutionCandidate@2383 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2393 {
+    <name not found> = ArrayList@2394[1] { ResolutionCandidate@2395 }
+    <name not found> = ArrayList@2396[1] { ResolutionCandidate@2395 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2405 {
+    <name not found> = ArrayList@2406[1] { ResolutionCandidate@2407 }
+    <name not found> = ArrayList@2408[1] { ResolutionCandidate@2407 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2417 {
+    <name not found> = ArrayList@2418[1] { ResolutionCandidate@2419 }
+    <name not found> = ArrayList@2420[1] { ResolutionCandidate@2419 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2429 {
+    <name not found> = ArrayList@2430[1] { ResolutionCandidate@2431 }
+    <name not found> = ArrayList@2432[1] { ResolutionCandidate@2431 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2441 {
+    <name not found> = ArrayList@2442[1] { ResolutionCandidate@2443 }
+    <name not found> = ArrayList@2444[1] { ResolutionCandidate@2443 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2453 {
+    <name not found> = ArrayList@2454[1] { ResolutionCandidate@2455 }
+    <name not found> = ArrayList@2456[1] { ResolutionCandidate@2455 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2465 {
+    <name not found> = ArrayList@2466[1] { ResolutionCandidate@2467 }
+    <name not found> = ArrayList@2468[1] { ResolutionCandidate@2467 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2477 {
+    <name not found> = ArrayList@2478[1] { ResolutionCandidate@2479 }
+    <name not found> = ArrayList@2480[1] { ResolutionCandidate@2479 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2489 {
+    <name not found> = ArrayList@2490[1] { ResolutionCandidate@2491 }
+    <name not found> = ArrayList@2492[1] { ResolutionCandidate@2491 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2501 {
+    <name not found> = ArrayList@2502[1] { ResolutionCandidate@2503 }
+    <name not found> = ArrayList@2504[1] { ResolutionCandidate@2503 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2513 {
+    <name not found> = ArrayList@2514[1] { ResolutionCandidate@2515 }
+    <name not found> = ArrayList@2516[1] { ResolutionCandidate@2515 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2525 {
+    <name not found> = ArrayList@2526[1] { ResolutionCandidate@2527 }
+    <name not found> = ArrayList@2528[1] { ResolutionCandidate@2527 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2537 {
+    <name not found> = ArrayList@2538[1] { ResolutionCandidate@2539 }
+    <name not found> = ArrayList@2540[1] { ResolutionCandidate@2539 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2549 {
+    <name not found> = ArrayList@2550[1] { ResolutionCandidate@2551 }
+    <name not found> = ArrayList@2552[1] { ResolutionCandidate@2551 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2561 {
+    <name not found> = ArrayList@2562[1] { ResolutionCandidate@2563 }
+    <name not found> = ArrayList@2564[1] { ResolutionCandidate@2563 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2573 {
+    <name not found> = ArrayList@2574[1] { ResolutionCandidate@2575 }
+    <name not found> = ArrayList@2576[1] { ResolutionCandidate@2575 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2585 {
+    <name not found> = ArrayList@2586[1] { ResolutionCandidate@2587 }
+    <name not found> = ArrayList@2588[1] { ResolutionCandidate@2587 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2597 {
+    <name not found> = ArrayList@2598[1] { ResolutionCandidate@2599 }
+    <name not found> = ArrayList@2600[1] { ResolutionCandidate@2599 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2609 {
+    <name not found> = ArrayList@2610[1] { ResolutionCandidate@2611 }
+    <name not found> = ArrayList@2612[1] { ResolutionCandidate@2611 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2621 {
+    <name not found> = ArrayList@2622[1] { ResolutionCandidate@2623 }
+    <name not found> = ArrayList@2624[1] { ResolutionCandidate@2623 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2633 {
+    <name not found> = ArrayList@2634[1] { ResolutionCandidate@2635 }
+    <name not found> = ArrayList@2636[1] { ResolutionCandidate@2635 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2645 {
+    <name not found> = ArrayList@2646[1] { ResolutionCandidate@2647 }
+    <name not found> = ArrayList@2648[1] { ResolutionCandidate@2647 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2657 {
+    <name not found> = ArrayList@2658[1] { ResolutionCandidate@2659 }
+    <name not found> = ArrayList@2660[1] { ResolutionCandidate@2659 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2669 {
+    <name not found> = ArrayList@2670[1] { ResolutionCandidate@2671 }
+    <name not found> = ArrayList@2672[1] { ResolutionCandidate@2671 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2681 {
+    <name not found> = ArrayList@2682[1] { ResolutionCandidate@2683 }
+    <name not found> = ArrayList@2684[1] { ResolutionCandidate@2683 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2693 {
+    <name not found> = ArrayList@2694[1] { ResolutionCandidate@2695 }
+    <name not found> = ArrayList@2696[1] { ResolutionCandidate@2695 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2705 {
+    <name not found> = ArrayList@2706[1] { ResolutionCandidate@2707 }
+    <name not found> = ArrayList@2708[1] { ResolutionCandidate@2707 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2717 {
+    <name not found> = ArrayList@2718[1] { ResolutionCandidate@2719 }
+    <name not found> = ArrayList@2720[1] { ResolutionCandidate@2719 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2729 {
+    <name not found> = ArrayList@2730[1] { ResolutionCandidate@2731 }
+    <name not found> = ArrayList@2732[1] { ResolutionCandidate@2731 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2741 {
+    <name not found> = ArrayList@2742[1] { ResolutionCandidate@2743 }
+    <name not found> = ArrayList@2744[1] { ResolutionCandidate@2743 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2753 {
+    <name not found> = ArrayList@2754[1] { ResolutionCandidate@2755 }
+    <name not found> = ArrayList@2756[1] { ResolutionCandidate@2755 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2765 {
+    <name not found> = ArrayList@2766[1] { ResolutionCandidate@2767 }
+    <name not found> = ArrayList@2768[1] { ResolutionCandidate@2767 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2777 {
+    <name not found> = ArrayList@2778[1] { ResolutionCandidate@2779 }
+    <name not found> = ArrayList@2780[1] { ResolutionCandidate@2779 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2789 {
+    <name not found> = ArrayList@2790[1] { ResolutionCandidate@2791 }
+    <name not found> = ArrayList@2792[1] { ResolutionCandidate@2791 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2801 {
+    <name not found> = ArrayList@2802[1] { ResolutionCandidate@2803 }
+    <name not found> = ArrayList@2804[1] { ResolutionCandidate@2803 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2813 {
+    <name not found> = ArrayList@2814[1] { ResolutionCandidate@2815 }
+    <name not found> = ArrayList@2816[1] { ResolutionCandidate@2815 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2825 {
+    <name not found> = ArrayList@2826[1] { ResolutionCandidate@2827 }
+    <name not found> = ArrayList@2828[1] { ResolutionCandidate@2827 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2837 {
+    <name not found> = ArrayList@2838[1] { ResolutionCandidate@2839 }
+    <name not found> = ArrayList@2840[1] { ResolutionCandidate@2839 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2849 {
+    <name not found> = ArrayList@2850[1] { ResolutionCandidate@2851 }
+    <name not found> = ArrayList@2852[1] { ResolutionCandidate@2851 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2861 {
+    <name not found> = ArrayList@2862[1] { ResolutionCandidate@2863 }
+    <name not found> = ArrayList@2864[1] { ResolutionCandidate@2863 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2873 {
+    <name not found> = ArrayList@2874[1] { ResolutionCandidate@2875 }
+    <name not found> = ArrayList@2876[1] { ResolutionCandidate@2875 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2885 {
+    <name not found> = ArrayList@2886[1] { ResolutionCandidate@2887 }
+    <name not found> = ArrayList@2888[1] { ResolutionCandidate@2887 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2897 {
+    <name not found> = ArrayList@2898[1] { ResolutionCandidate@2899 }
+    <name not found> = ArrayList@2900[1] { ResolutionCandidate@2899 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2909 {
+    <name not found> = ArrayList@2910[1] { ResolutionCandidate@2911 }
+    <name not found> = ArrayList@2912[1] { ResolutionCandidate@2911 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2921 {
+    <name not found> = ArrayList@2922[1] { ResolutionCandidate@2923 }
+    <name not found> = ArrayList@2924[1] { ResolutionCandidate@2923 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2933 {
+    <name not found> = ArrayList@2934[1] { ResolutionCandidate@2935 }
+    <name not found> = ArrayList@2936[1] { ResolutionCandidate@2935 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2945 {
+    <name not found> = ArrayList@2946[1] { ResolutionCandidate@2947 }
+    <name not found> = ArrayList@2948[1] { ResolutionCandidate@2947 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2957 {
+    <name not found> = ArrayList@2958[1] { ResolutionCandidate@2959 }
+    <name not found> = ArrayList@2960[1] { ResolutionCandidate@2959 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2969 {
+    <name not found> = ArrayList@2970[1] { ResolutionCandidate@2971 }
+    <name not found> = ArrayList@2972[1] { ResolutionCandidate@2971 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2981 {
+    <name not found> = ArrayList@2982[1] { ResolutionCandidate@2983 }
+    <name not found> = ArrayList@2984[1] { ResolutionCandidate@2983 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@2993 {
+    <name not found> = ArrayList@2994[1] { ResolutionCandidate@2995 }
+    <name not found> = ArrayList@2996[1] { ResolutionCandidate@2995 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3005 {
+    <name not found> = ArrayList@3006[1] { ResolutionCandidate@3007 }
+    <name not found> = ArrayList@3008[1] { ResolutionCandidate@3007 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3017 {
+    <name not found> = ArrayList@3018[1] { ResolutionCandidate@3019 }
+    <name not found> = ArrayList@3020[1] { ResolutionCandidate@3019 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3029 {
+    <name not found> = ArrayList@3030[1] { ResolutionCandidate@3031 }
+    <name not found> = ArrayList@3032[1] { ResolutionCandidate@3031 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3041 {
+    <name not found> = ArrayList@3042[1] { ResolutionCandidate@3043 }
+    <name not found> = ArrayList@3044[1] { ResolutionCandidate@3043 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3053 {
+    <name not found> = ArrayList@3054[1] { ResolutionCandidate@3055 }
+    <name not found> = ArrayList@3056[1] { ResolutionCandidate@3055 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3065 {
+    <name not found> = ArrayList@3066[1] { ResolutionCandidate@3067 }
+    <name not found> = ArrayList@3068[1] { ResolutionCandidate@3067 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3077 {
+    <name not found> = ArrayList@3078[1] { ResolutionCandidate@3079 }
+    <name not found> = ArrayList@3080[1] { ResolutionCandidate@3079 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3089 {
+    <name not found> = ArrayList@3090[1] { ResolutionCandidate@3091 }
+    <name not found> = ArrayList@3092[1] { ResolutionCandidate@3091 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3101 {
+    <name not found> = ArrayList@3102[1] { ResolutionCandidate@3103 }
+    <name not found> = ArrayList@3104[1] { ResolutionCandidate@3103 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3113 {
+    <name not found> = ArrayList@3114[1] { ResolutionCandidate@3115 }
+    <name not found> = ArrayList@3116[1] { ResolutionCandidate@3115 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3125 {
+    <name not found> = ArrayList@3126[1] { ResolutionCandidate@3127 }
+    <name not found> = ArrayList@3128[1] { ResolutionCandidate@3127 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3137 {
+    <name not found> = ArrayList@3138[1] { ResolutionCandidate@3139 }
+    <name not found> = ArrayList@3140[1] { ResolutionCandidate@3139 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3149 {
+    <name not found> = ArrayList@3150[1] { ResolutionCandidate@3151 }
+    <name not found> = ArrayList@3152[1] { ResolutionCandidate@3151 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3161 {
+    <name not found> = ArrayList@3162[1] { ResolutionCandidate@3163 }
+    <name not found> = ArrayList@3164[1] { ResolutionCandidate@3163 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3173 {
+    <name not found> = ArrayList@3174[1] { ResolutionCandidate@3175 }
+    <name not found> = ArrayList@3176[1] { ResolutionCandidate@3175 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3185 {
+    <name not found> = ArrayList@3186[1] { ResolutionCandidate@3187 }
+    <name not found> = ArrayList@3188[1] { ResolutionCandidate@3187 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3197 {
+    <name not found> = ArrayList@3198[1] { ResolutionCandidate@3199 }
+    <name not found> = ArrayList@3200[1] { ResolutionCandidate@3199 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3209 {
+    <name not found> = ArrayList@3210[1] { ResolutionCandidate@3211 }
+    <name not found> = ArrayList@3212[1] { ResolutionCandidate@3211 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3221 {
+    <name not found> = ArrayList@3222[1] { ResolutionCandidate@3223 }
+    <name not found> = ArrayList@3224[1] { ResolutionCandidate@3223 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3233 {
+    <name not found> = ArrayList@3234[1] { ResolutionCandidate@3235 }
+    <name not found> = ArrayList@3236[1] { ResolutionCandidate@3235 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3245 {
+    <name not found> = ArrayList@3246[1] { ResolutionCandidate@3247 }
+    <name not found> = ArrayList@3248[1] { ResolutionCandidate@3247 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3257 {
+    <name not found> = ArrayList@3258[1] { ResolutionCandidate@3259 }
+    <name not found> = ArrayList@3260[1] { ResolutionCandidate@3259 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3269 {
+    <name not found> = ArrayList@3270[1] { ResolutionCandidate@3271 }
+    <name not found> = ArrayList@3272[1] { ResolutionCandidate@3271 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3281 {
+    <name not found> = ArrayList@3282[1] { ResolutionCandidate@3283 }
+    <name not found> = ArrayList@3284[1] { ResolutionCandidate@3283 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3293 {
+    <name not found> = ArrayList@3294[1] { ResolutionCandidate@3295 }
+    <name not found> = ArrayList@3296[1] { ResolutionCandidate@3295 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3305 {
+    <name not found> = ArrayList@3306[1] { ResolutionCandidate@3307 }
+    <name not found> = ArrayList@3308[1] { ResolutionCandidate@3307 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3317 {
+    <name not found> = ArrayList@3318[1] { ResolutionCandidate@3319 }
+    <name not found> = ArrayList@3320[1] { ResolutionCandidate@3319 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3329 {
+    <name not found> = ArrayList@3330[1] { ResolutionCandidate@3331 }
+    <name not found> = ArrayList@3332[1] { ResolutionCandidate@3331 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3341 {
+    <name not found> = ArrayList@3342[1] { ResolutionCandidate@3343 }
+    <name not found> = ArrayList@3344[1] { ResolutionCandidate@3343 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3353 {
+    <name not found> = ArrayList@3354[1] { ResolutionCandidate@3355 }
+    <name not found> = ArrayList@3356[1] { ResolutionCandidate@3355 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3365 {
+    <name not found> = ArrayList@3366[1] { ResolutionCandidate@3367 }
+    <name not found> = ArrayList@3368[1] { ResolutionCandidate@3367 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3377 {
+    <name not found> = ArrayList@3378[1] { ResolutionCandidate@3379 }
+    <name not found> = ArrayList@3380[1] { ResolutionCandidate@3379 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3389 {
+    <name not found> = ArrayList@3390[1] { ResolutionCandidate@3391 }
+    <name not found> = ArrayList@3392[1] { ResolutionCandidate@3391 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3401 {
+    <name not found> = ArrayList@3402[1] { ResolutionCandidate@3403 }
+    <name not found> = ArrayList@3404[1] { ResolutionCandidate@3403 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3413 {
+    <name not found> = ArrayList@3414[1] { ResolutionCandidate@3415 }
+    <name not found> = ArrayList@3416[1] { ResolutionCandidate@3415 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3425 {
+    <name not found> = ArrayList@3426[1] { ResolutionCandidate@3427 }
+    <name not found> = ArrayList@3428[1] { ResolutionCandidate@3427 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3437 {
+    <name not found> = ArrayList@3438[1] { ResolutionCandidate@3439 }
+    <name not found> = ArrayList@3440[1] { ResolutionCandidate@3439 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3449 {
+    <name not found> = ArrayList@3450[1] { ResolutionCandidate@3451 }
+    <name not found> = ArrayList@3452[1] { ResolutionCandidate@3451 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3461 {
+    <name not found> = ArrayList@3462[1] { ResolutionCandidate@3463 }
+    <name not found> = ArrayList@3464[1] { ResolutionCandidate@3463 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3473 {
+    <name not found> = ArrayList@3474[1] { ResolutionCandidate@3475 }
+    <name not found> = ArrayList@3476[1] { ResolutionCandidate@3475 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3485 {
+    <name not found> = ArrayList@3486[1] { ResolutionCandidate@3487 }
+    <name not found> = ArrayList@3488[1] { ResolutionCandidate@3487 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3497 {
+    <name not found> = ArrayList@3498[1] { ResolutionCandidate@3499 }
+    <name not found> = ArrayList@3500[1] { ResolutionCandidate@3499 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3509 {
+    <name not found> = ArrayList@3510[1] { ResolutionCandidate@3511 }
+    <name not found> = ArrayList@3512[1] { ResolutionCandidate@3511 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3521 {
+    <name not found> = ArrayList@3522[1] { ResolutionCandidate@3523 }
+    <name not found> = ArrayList@3524[1] { ResolutionCandidate@3523 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3533 {
+    <name not found> = ArrayList@3534[1] { ResolutionCandidate@3535 }
+    <name not found> = ArrayList@3536[1] { ResolutionCandidate@3535 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3545 {
+    <name not found> = ArrayList@3546[1] { ResolutionCandidate@3547 }
+    <name not found> = ArrayList@3548[1] { ResolutionCandidate@3547 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3557 {
+    <name not found> = ArrayList@3558[1] { ResolutionCandidate@3559 }
+    <name not found> = ArrayList@3560[1] { ResolutionCandidate@3559 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3569 {
+    <name not found> = ArrayList@3570[1] { ResolutionCandidate@3571 }
+    <name not found> = ArrayList@3572[1] { ResolutionCandidate@3571 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3581 {
+    <name not found> = ArrayList@3582[1] { ResolutionCandidate@3583 }
+    <name not found> = ArrayList@3584[1] { ResolutionCandidate@3583 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3593 {
+    <name not found> = ArrayList@3594[1] { ResolutionCandidate@3595 }
+    <name not found> = ArrayList@3596[1] { ResolutionCandidate@3595 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3605 {
+    <name not found> = ArrayList@3606[1] { ResolutionCandidate@3607 }
+    <name not found> = ArrayList@3608[1] { ResolutionCandidate@3607 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3617 {
+    <name not found> = ArrayList@3618[1] { ResolutionCandidate@3619 }
+    <name not found> = ArrayList@3620[1] { ResolutionCandidate@3619 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3629 {
+    <name not found> = ArrayList@3630[1] { ResolutionCandidate@3631 }
+    <name not found> = ArrayList@3632[1] { ResolutionCandidate@3631 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3641 {
+    <name not found> = ArrayList@3642[1] { ResolutionCandidate@3643 }
+    <name not found> = ArrayList@3644[1] { ResolutionCandidate@3643 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3653 {
+    <name not found> = ArrayList@3654[1] { ResolutionCandidate@3655 }
+    <name not found> = ArrayList@3656[1] { ResolutionCandidate@3655 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3665 {
+    <name not found> = ArrayList@3666[1] { ResolutionCandidate@3667 }
+    <name not found> = ArrayList@3668[1] { ResolutionCandidate@3667 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3677 {
+    <name not found> = ArrayList@3678[1] { ResolutionCandidate@3679 }
+    <name not found> = ArrayList@3680[1] { ResolutionCandidate@3679 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3689 {
+    <name not found> = ArrayList@3690[1] { ResolutionCandidate@3691 }
+    <name not found> = ArrayList@3692[1] { ResolutionCandidate@3691 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3701 {
+    <name not found> = ArrayList@3702[1] { ResolutionCandidate@3703 }
+    <name not found> = ArrayList@3704[1] { ResolutionCandidate@3703 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3713 {
+    <name not found> = ArrayList@3714[1] { ResolutionCandidate@3715 }
+    <name not found> = ArrayList@3716[1] { ResolutionCandidate@3715 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3725 {
+    <name not found> = ArrayList@3726[1] { ResolutionCandidate@3727 }
+    <name not found> = ArrayList@3728[1] { ResolutionCandidate@3727 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3737 {
+    <name not found> = ArrayList@3738[1] { ResolutionCandidate@3739 }
+    <name not found> = ArrayList@3740[1] { ResolutionCandidate@3739 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3749 {
+    <name not found> = ArrayList@3750[1] { ResolutionCandidate@3751 }
+    <name not found> = ArrayList@3752[1] { ResolutionCandidate@3751 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3761 {
+    <name not found> = ArrayList@3762[1] { ResolutionCandidate@3763 }
+    <name not found> = ArrayList@3764[1] { ResolutionCandidate@3763 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3773 {
+    <name not found> = ArrayList@3774[1] { ResolutionCandidate@3775 }
+    <name not found> = ArrayList@3776[1] { ResolutionCandidate@3775 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3785 {
+    <name not found> = ArrayList@3786[1] { ResolutionCandidate@3787 }
+    <name not found> = ArrayList@3788[1] { ResolutionCandidate@3787 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3797 {
+    <name not found> = ArrayList@3798[1] { ResolutionCandidate@3799 }
+    <name not found> = ArrayList@3800[1] { ResolutionCandidate@3799 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3809 {
+    <name not found> = ArrayList@3810[1] { ResolutionCandidate@3811 }
+    <name not found> = ArrayList@3812[1] { ResolutionCandidate@3811 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3821 {
+    <name not found> = ArrayList@3822[1] { ResolutionCandidate@3823 }
+    <name not found> = ArrayList@3824[1] { ResolutionCandidate@3823 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3833 {
+    <name not found> = ArrayList@3834[1] { ResolutionCandidate@3835 }
+    <name not found> = ArrayList@3836[1] { ResolutionCandidate@3835 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3845 {
+    <name not found> = ArrayList@3846[1] { ResolutionCandidate@3847 }
+    <name not found> = ArrayList@3848[1] { ResolutionCandidate@3847 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3857 {
+    <name not found> = ArrayList@3858[1] { ResolutionCandidate@3859 }
+    <name not found> = ArrayList@3860[1] { ResolutionCandidate@3859 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3869 {
+    <name not found> = ArrayList@3870[1] { ResolutionCandidate@3871 }
+    <name not found> = ArrayList@3872[1] { ResolutionCandidate@3871 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3881 {
+    <name not found> = ArrayList@3882[1] { ResolutionCandidate@3883 }
+    <name not found> = ArrayList@3884[1] { ResolutionCandidate@3883 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3893 {
+    <name not found> = ArrayList@3894[1] { ResolutionCandidate@3895 }
+    <name not found> = ArrayList@3896[1] { ResolutionCandidate@3895 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3905 {
+    <name not found> = ArrayList@3906[1] { ResolutionCandidate@3907 }
+    <name not found> = ArrayList@3908[1] { ResolutionCandidate@3907 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3917 {
+    <name not found> = ArrayList@3918[1] { ResolutionCandidate@3919 }
+    <name not found> = ArrayList@3920[1] { ResolutionCandidate@3919 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3929 {
+    <name not found> = ArrayList@3930[1] { ResolutionCandidate@3931 }
+    <name not found> = ArrayList@3932[1] { ResolutionCandidate@3931 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3941 {
+    <name not found> = ArrayList@3942[1] { ResolutionCandidate@3943 }
+    <name not found> = ArrayList@3944[1] { ResolutionCandidate@3943 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3953 {
+    <name not found> = ArrayList@3954[1] { ResolutionCandidate@3955 }
+    <name not found> = ArrayList@3956[1] { ResolutionCandidate@3955 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3965 {
+    <name not found> = ArrayList@3966[1] { ResolutionCandidate@3967 }
+    <name not found> = ArrayList@3968[1] { ResolutionCandidate@3967 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3977 {
+    <name not found> = ArrayList@3978[1] { ResolutionCandidate@3979 }
+    <name not found> = ArrayList@3980[1] { ResolutionCandidate@3979 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@3989 {
+    <name not found> = ArrayList@3990[1] { ResolutionCandidate@3991 }
+    <name not found> = ArrayList@3992[1] { ResolutionCandidate@3991 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4001 {
+    <name not found> = ArrayList@4002[1] { ResolutionCandidate@4003 }
+    <name not found> = ArrayList@4004[1] { ResolutionCandidate@4003 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4013 {
+    <name not found> = ArrayList@4014[1] { ResolutionCandidate@4015 }
+    <name not found> = ArrayList@4016[1] { ResolutionCandidate@4015 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4025 {
+    <name not found> = ArrayList@4026[1] { ResolutionCandidate@4027 }
+    <name not found> = ArrayList@4028[1] { ResolutionCandidate@4027 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4037 {
+    <name not found> = ArrayList@4038[1] { ResolutionCandidate@4039 }
+    <name not found> = ArrayList@4040[1] { ResolutionCandidate@4039 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4049 {
+    <name not found> = ArrayList@4050[1] { ResolutionCandidate@4051 }
+    <name not found> = ArrayList@4052[1] { ResolutionCandidate@4051 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4061 {
+    <name not found> = ArrayList@4062[1] { ResolutionCandidate@4063 }
+    <name not found> = ArrayList@4064[1] { ResolutionCandidate@4063 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4073 {
+    <name not found> = ArrayList@4074[1] { ResolutionCandidate@4075 }
+    <name not found> = ArrayList@4076[1] { ResolutionCandidate@4075 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4085 {
+    <name not found> = ArrayList@4086[1] { ResolutionCandidate@4087 }
+    <name not found> = ArrayList@4088[1] { ResolutionCandidate@4087 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4097 {
+    <name not found> = ArrayList@4098[1] { ResolutionCandidate@4099 }
+    <name not found> = ArrayList@4100[1] { ResolutionCandidate@4099 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4109 {
+    <name not found> = ArrayList@4110[1] { ResolutionCandidate@4111 }
+    <name not found> = ArrayList@4112[1] { ResolutionCandidate@4111 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4121 {
+    <name not found> = ArrayList@4122[1] { ResolutionCandidate@4123 }
+    <name not found> = ArrayList@4124[1] { ResolutionCandidate@4123 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4133 {
+    <name not found> = ArrayList@4134[1] { ResolutionCandidate@4135 }
+    <name not found> = ArrayList@4136[1] { ResolutionCandidate@4135 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4145 {
+    <name not found> = ArrayList@4146[1] { ResolutionCandidate@4147 }
+    <name not found> = ArrayList@4148[1] { ResolutionCandidate@4147 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4157 {
+    <name not found> = ArrayList@4158[1] { ResolutionCandidate@4159 }
+    <name not found> = ArrayList@4160[1] { ResolutionCandidate@4159 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4169 {
+    <name not found> = ArrayList@4170[1] { ResolutionCandidate@4171 }
+    <name not found> = ArrayList@4172[1] { ResolutionCandidate@4171 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4181 {
+    <name not found> = ArrayList@4182[1] { ResolutionCandidate@4183 }
+    <name not found> = ArrayList@4184[1] { ResolutionCandidate@4183 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4193 {
+    <name not found> = ArrayList@4194[1] { ResolutionCandidate@4195 }
+    <name not found> = ArrayList@4196[1] { ResolutionCandidate@4195 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4205 {
+    <name not found> = ArrayList@4206[1] { ResolutionCandidate@4207 }
+    <name not found> = ArrayList@4208[1] { ResolutionCandidate@4207 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4217 {
+    <name not found> = ArrayList@4218[1] { ResolutionCandidate@4219 }
+    <name not found> = ArrayList@4220[1] { ResolutionCandidate@4219 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4229 {
+    <name not found> = ArrayList@4230[1] { ResolutionCandidate@4231 }
+    <name not found> = ArrayList@4232[1] { ResolutionCandidate@4231 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4241 {
+    <name not found> = ArrayList@4242[1] { ResolutionCandidate@4243 }
+    <name not found> = ArrayList@4244[1] { ResolutionCandidate@4243 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4253 {
+    <name not found> = ArrayList@4254[1] { ResolutionCandidate@4255 }
+    <name not found> = ArrayList@4256[1] { ResolutionCandidate@4255 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4265 {
+    <name not found> = ArrayList@4266[1] { ResolutionCandidate@4267 }
+    <name not found> = ArrayList@4268[1] { ResolutionCandidate@4267 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4277 {
+    <name not found> = ArrayList@4278[1] { ResolutionCandidate@4279 }
+    <name not found> = ArrayList@4280[1] { ResolutionCandidate@4279 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4289 {
+    <name not found> = ArrayList@4290[1] { ResolutionCandidate@4291 }
+    <name not found> = ArrayList@4292[1] { ResolutionCandidate@4291 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4301 {
+    <name not found> = ArrayList@4302[1] { ResolutionCandidate@4303 }
+    <name not found> = ArrayList@4304[1] { ResolutionCandidate@4303 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4313 {
+    <name not found> = ArrayList@4314[1] { ResolutionCandidate@4315 }
+    <name not found> = ArrayList@4316[1] { ResolutionCandidate@4315 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4325 {
+    <name not found> = ArrayList@4326[1] { ResolutionCandidate@4327 }
+    <name not found> = ArrayList@4328[1] { ResolutionCandidate@4327 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4337 {
+    <name not found> = ArrayList@4338[1] { ResolutionCandidate@4339 }
+    <name not found> = ArrayList@4340[1] { ResolutionCandidate@4339 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4349 {
+    <name not found> = ArrayList@4350[1] { ResolutionCandidate@4351 }
+    <name not found> = ArrayList@4352[1] { ResolutionCandidate@4351 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4361 {
+    <name not found> = ArrayList@4362[1] { ResolutionCandidate@4363 }
+    <name not found> = ArrayList@4364[1] { ResolutionCandidate@4363 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4373 {
+    <name not found> = ArrayList@4374[1] { ResolutionCandidate@4375 }
+    <name not found> = ArrayList@4376[1] { ResolutionCandidate@4375 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4385 {
+    <name not found> = ArrayList@4386[1] { ResolutionCandidate@4387 }
+    <name not found> = ArrayList@4388[1] { ResolutionCandidate@4387 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4397 {
+    <name not found> = ArrayList@4398[1] { ResolutionCandidate@4399 }
+    <name not found> = ArrayList@4400[1] { ResolutionCandidate@4399 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4409 {
+    <name not found> = ArrayList@4410[1] { ResolutionCandidate@4411 }
+    <name not found> = ArrayList@4412[1] { ResolutionCandidate@4411 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4421 {
+    <name not found> = ArrayList@4422[1] { ResolutionCandidate@4423 }
+    <name not found> = ArrayList@4424[1] { ResolutionCandidate@4423 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4433 {
+    <name not found> = ArrayList@4434[1] { ResolutionCandidate@4435 }
+    <name not found> = ArrayList@4436[1] { ResolutionCandidate@4435 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4445 {
+    <name not found> = ArrayList@4446[1] { ResolutionCandidate@4447 }
+    <name not found> = ArrayList@4448[1] { ResolutionCandidate@4447 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4457 {
+    <name not found> = ArrayList@4458[1] { ResolutionCandidate@4459 }
+    <name not found> = ArrayList@4460[1] { ResolutionCandidate@4459 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4469 {
+    <name not found> = ArrayList@4470[1] { ResolutionCandidate@4471 }
+    <name not found> = ArrayList@4472[1] { ResolutionCandidate@4471 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4481 {
+    <name not found> = ArrayList@4482[1] { ResolutionCandidate@4483 }
+    <name not found> = ArrayList@4484[1] { ResolutionCandidate@4483 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4493 {
+    <name not found> = ArrayList@4494[1] { ResolutionCandidate@4495 }
+    <name not found> = ArrayList@4496[1] { ResolutionCandidate@4495 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4505 {
+    <name not found> = ArrayList@4506[1] { ResolutionCandidate@4507 }
+    <name not found> = ArrayList@4508[1] { ResolutionCandidate@4507 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4517 {
+    <name not found> = ArrayList@4518[1] { ResolutionCandidate@4519 }
+    <name not found> = ArrayList@4520[1] { ResolutionCandidate@4519 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <name not found> = EmptyList@299[empty]
+}
+
+ResolutionTaskHolder@4529 {
+    <name not found> = ArrayList@4530[1] { ResolutionCandidate@4531 }
+    <name not found> = ArrayList@4532[1] { ResolutionCandidate@4531 }
+    <name not found> = EmptyList@299[empty]
+    <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]
+    <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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@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@5945 {
+    <name not found> = ArrayList@5946[1] { ResolutionCandidate@5947 }
+    <name not found> = ArrayList@5948[1] { ResolutionCandidate@5947 }
+}
+
+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@5957 {
+    <name not found> = ArrayList@5958[1] { ResolutionCandidate@5959 }
+    <name not found> = ArrayList@5960[1] { ResolutionCandidate@5959 }
+}
+
+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@5969 {
+    <name not found> = ArrayList@5970[1] { ResolutionCandidate@5971 }
+    <name not found> = ArrayList@5972[1] { ResolutionCandidate@5971 }
+}
+
+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@5981 {
+    <name not found> = ArrayList@5982[1] { ResolutionCandidate@5983 }
+    <name not found> = ArrayList@5984[1] { ResolutionCandidate@5983 }
+}
+
+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@5993 {
+    <name not found> = ArrayList@5994[1] { ResolutionCandidate@5995 }
+    <name not found> = ArrayList@5996[1] { ResolutionCandidate@5995 }
+}
+
+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@6005 {
+    <name not found> = ArrayList@6006[1] { ResolutionCandidate@6007 }
+    <name not found> = ArrayList@6008[1] { ResolutionCandidate@6007 }
+}
+
+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@6017 {
+    <name not found> = ArrayList@6018[1] { ResolutionCandidate@6019 }
+    <name not found> = ArrayList@6020[1] { ResolutionCandidate@6019 }
+}
+
+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@6029 {
+    <name not found> = ArrayList@6030[1] { ResolutionCandidate@6031 }
+    <name not found> = ArrayList@6032[1] { ResolutionCandidate@6031 }
+}
+
+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@6041 {
+    <name not found> = ArrayList@6042[1] { ResolutionCandidate@6043 }
+    <name not found> = ArrayList@6044[1] { ResolutionCandidate@6043 }
+}
+
+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@6053 {
+    <name not found> = ArrayList@6054[1] { ResolutionCandidate@6055 }
+    <name not found> = ArrayList@6056[1] { ResolutionCandidate@6055 }
+}
+
+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@6065 {
+    <name not found> = ArrayList@6066[1] { ResolutionCandidate@6067 }
+    <name not found> = ArrayList@6068[1] { ResolutionCandidate@6067 }
+}
+
+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@6077 {
+    <name not found> = ArrayList@6078[1] { ResolutionCandidate@6079 }
+    <name not found> = ArrayList@6080[1] { ResolutionCandidate@6079 }
+}
+
+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@6089 {
+    <name not found> = ArrayList@6090[1] { ResolutionCandidate@6091 }
+    <name not found> = ArrayList@6092[1] { ResolutionCandidate@6091 }
+}
+
+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@6101 {
+    <name not found> = ArrayList@6102[1] { ResolutionCandidate@6103 }
+    <name not found> = ArrayList@6104[1] { ResolutionCandidate@6103 }
+}
+
+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@6113 {
+    <name not found> = ArrayList@6114[1] { ResolutionCandidate@6115 }
+    <name not found> = ArrayList@6116[1] { ResolutionCandidate@6115 }
+}
+
+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@6125 {
+    <name not found> = ArrayList@6126[1] { ResolutionCandidate@6127 }
+    <name not found> = ArrayList@6128[1] { ResolutionCandidate@6127 }
+}
+
+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@6137 {
+    <name not found> = ArrayList@6138[1] { ResolutionCandidate@6139 }
+    <name not found> = ArrayList@6140[1] { ResolutionCandidate@6139 }
+}
+
+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@6149 {
+    <name not found> = ArrayList@6150[1] { ResolutionCandidate@6151 }
+    <name not found> = ArrayList@6152[1] { ResolutionCandidate@6151 }
+}
+
+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@6161 {
+    <name not found> = ArrayList@6162[1] { ResolutionCandidate@6163 }
+    <name not found> = ArrayList@6164[1] { ResolutionCandidate@6163 }
+}
+
+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@6173 {
+    <name not found> = ArrayList@6174[1] { ResolutionCandidate@6175 }
+    <name not found> = ArrayList@6176[1] { ResolutionCandidate@6175 }
+}
+
+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@6185 {
+    <name not found> = ArrayList@6186[1] { ResolutionCandidate@6187 }
+    <name not found> = ArrayList@6188[1] { ResolutionCandidate@6187 }
+}
+
+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@6197 {
+    <name not found> = ArrayList@6198[1] { ResolutionCandidate@6199 }
+    <name not found> = ArrayList@6200[1] { ResolutionCandidate@6199 }
+}
+
+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@6209 {
+    <name not found> = ArrayList@6210[1] { ResolutionCandidate@6211 }
+    <name not found> = ArrayList@6212[1] { ResolutionCandidate@6211 }
+}
+
+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@6221 {
+    <name not found> = ArrayList@6222[1] { ResolutionCandidate@6223 }
+    <name not found> = ArrayList@6224[1] { ResolutionCandidate@6223 }
+}
+
+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@6233 {
+    <name not found> = ArrayList@6234[1] { ResolutionCandidate@6235 }
+    <name not found> = ArrayList@6236[1] { ResolutionCandidate@6235 }
+}
+
+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@6245 {
+    <name not found> = ArrayList@6246[1] { ResolutionCandidate@6247 }
+    <name not found> = ArrayList@6248[1] { ResolutionCandidate@6247 }
+}
+
+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@6257 {
+    <name not found> = ArrayList@6258[1] { ResolutionCandidate@6259 }
+    <name not found> = ArrayList@6260[1] { ResolutionCandidate@6259 }
+}
+
+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@6269 {
+    <name not found> = ArrayList@6270[1] { ResolutionCandidate@6271 }
+    <name not found> = ArrayList@6272[1] { ResolutionCandidate@6271 }
+}
+
+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@6281 {
+    <name not found> = ArrayList@6282[1] { ResolutionCandidate@6283 }
+    <name not found> = ArrayList@6284[1] { ResolutionCandidate@6283 }
+}
+
+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@6293 {
+    <name not found> = ArrayList@6294[1] { ResolutionCandidate@6295 }
+    <name not found> = ArrayList@6296[1] { ResolutionCandidate@6295 }
+}
+
+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@6305 {
+    <name not found> = ArrayList@6306[1] { ResolutionCandidate@6307 }
+    <name not found> = ArrayList@6308[1] { ResolutionCandidate@6307 }
+}
+
+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@6317 {
+    <name not found> = ArrayList@6318[1] { ResolutionCandidate@6319 }
+    <name not found> = ArrayList@6320[1] { ResolutionCandidate@6319 }
+}
+
+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@6329 {
+    <name not found> = ArrayList@6330[1] { ResolutionCandidate@6331 }
+    <name not found> = ArrayList@6332[1] { ResolutionCandidate@6331 }
+}
+
+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@6341 {
+    <name not found> = ArrayList@6342[1] { ResolutionCandidate@6343 }
+    <name not found> = ArrayList@6344[1] { ResolutionCandidate@6343 }
+}
+
+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@6353 {
+    <name not found> = ArrayList@6354[1] { ResolutionCandidate@6355 }
+    <name not found> = ArrayList@6356[1] { ResolutionCandidate@6355 }
+}
+
+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@6365 {
+    <name not found> = ArrayList@6366[1] { ResolutionCandidate@6367 }
+    <name not found> = ArrayList@6368[1] { ResolutionCandidate@6367 }
+}
+
+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@6377 {
+    <name not found> = ArrayList@6378[1] { ResolutionCandidate@6379 }
+    <name not found> = ArrayList@6380[1] { ResolutionCandidate@6379 }
+}
+
+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@6389 {
+    <name not found> = ArrayList@6390[1] { ResolutionCandidate@6391 }
+    <name not found> = ArrayList@6392[1] { ResolutionCandidate@6391 }
+}
+
+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@6401 {
+    <name not found> = ArrayList@6402[1] { ResolutionCandidate@6403 }
+    <name not found> = ArrayList@6404[1] { ResolutionCandidate@6403 }
+}
+
+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@6413 {
+    <name not found> = ArrayList@6414[1] { ResolutionCandidate@6415 }
+    <name not found> = ArrayList@6416[1] { ResolutionCandidate@6415 }
+}
+
+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@6425 {
+    <name not found> = ArrayList@6426[1] { ResolutionCandidate@6427 }
+    <name not found> = ArrayList@6428[1] { ResolutionCandidate@6427 }
+}
+
+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@6437 {
+    <name not found> = ArrayList@6438[1] { ResolutionCandidate@6439 }
+    <name not found> = ArrayList@6440[1] { ResolutionCandidate@6439 }
+}
+
+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@6449 {
+    <name not found> = ArrayList@6450[1] { ResolutionCandidate@6451 }
+    <name not found> = ArrayList@6452[1] { ResolutionCandidate@6451 }
+}
+
+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@6461 {
+    <name not found> = ArrayList@6462[1] { ResolutionCandidate@6463 }
+    <name not found> = ArrayList@6464[1] { ResolutionCandidate@6463 }
+}
+
+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@6473 {
+    <name not found> = ArrayList@6474[1] { ResolutionCandidate@6475 }
+    <name not found> = ArrayList@6476[1] { ResolutionCandidate@6475 }
+}
+
+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@6485 {
+    <name not found> = ArrayList@6486[1] { ResolutionCandidate@6487 }
+    <name not found> = ArrayList@6488[1] { ResolutionCandidate@6487 }
+}
+
+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@6497 {
+    <name not found> = ArrayList@6498[1] { ResolutionCandidate@6499 }
+    <name not found> = ArrayList@6500[1] { ResolutionCandidate@6499 }
+}
+
+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@6509 {
+    <name not found> = ArrayList@6510[1] { ResolutionCandidate@6511 }
+    <name not found> = ArrayList@6512[1] { ResolutionCandidate@6511 }
+}
+
+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@6521 {
+    <name not found> = ArrayList@6522[1] { ResolutionCandidate@6523 }
+    <name not found> = ArrayList@6524[1] { ResolutionCandidate@6523 }
+}
+
+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@6533 {
+    <name not found> = ArrayList@6534[1] { ResolutionCandidate@6535 }
+    <name not found> = ArrayList@6536[1] { ResolutionCandidate@6535 }
+}
+
+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@6545 {
+    <name not found> = ArrayList@6546[1] { ResolutionCandidate@6547 }
+    <name not found> = ArrayList@6548[1] { ResolutionCandidate@6547 }
+}
+
+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@6557 {
+    <name not found> = ArrayList@6558[1] { ResolutionCandidate@6559 }
+    <name not found> = ArrayList@6560[1] { ResolutionCandidate@6559 }
+}
+
+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@6569 {
+    <name not found> = ArrayList@6570[1] { ResolutionCandidate@6571 }
+    <name not found> = ArrayList@6572[1] { ResolutionCandidate@6571 }
+}
+
+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@6581 {
+    <name not found> = ArrayList@6582[1] { ResolutionCandidate@6583 }
+    <name not found> = ArrayList@6584[1] { ResolutionCandidate@6583 }
+}
+
+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@6593 {
+    <name not found> = ArrayList@6594[1] { ResolutionCandidate@6595 }
+    <name not found> = ArrayList@6596[1] { ResolutionCandidate@6595 }
+}
+
+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@6605 {
+    <name not found> = ArrayList@6606[1] { ResolutionCandidate@6607 }
+    <name not found> = ArrayList@6608[1] { ResolutionCandidate@6607 }
+}
+
+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@6617 {
+    <name not found> = ArrayList@6618[1] { ResolutionCandidate@6619 }
+    <name not found> = ArrayList@6620[1] { ResolutionCandidate@6619 }
+}
+
+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@6629 {
+    <name not found> = ArrayList@6630[1] { ResolutionCandidate@6631 }
+    <name not found> = ArrayList@6632[1] { ResolutionCandidate@6631 }
+}
+
+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@6641 {
+    <name not found> = ArrayList@6642[1] { ResolutionCandidate@6643 }
+    <name not found> = ArrayList@6644[1] { ResolutionCandidate@6643 }
+}
+
+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@6653 {
+    <name not found> = ArrayList@6654[1] { ResolutionCandidate@6655 }
+    <name not found> = ArrayList@6656[1] { ResolutionCandidate@6655 }
+}
+
+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@6665 {
+    <name not found> = ArrayList@6666[1] { ResolutionCandidate@6667 }
+    <name not found> = ArrayList@6668[1] { ResolutionCandidate@6667 }
+}
+
+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@6677 {
+    <name not found> = ArrayList@6678[1] { ResolutionCandidate@6679 }
+    <name not found> = ArrayList@6680[1] { ResolutionCandidate@6679 }
+}
+
+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@6689 {
+    <name not found> = ArrayList@6690[1] { ResolutionCandidate@6691 }
+    <name not found> = ArrayList@6692[1] { ResolutionCandidate@6691 }
+}
+
+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@6701 {
+    <name not found> = ArrayList@6702[1] { ResolutionCandidate@6703 }
+    <name not found> = ArrayList@6704[1] { ResolutionCandidate@6703 }
+}
+
+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@6713 {
+    <name not found> = ArrayList@6714[1] { ResolutionCandidate@6715 }
+    <name not found> = ArrayList@6716[1] { ResolutionCandidate@6715 }
+}
+
+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@6725 {
+    <name not found> = ArrayList@6726[1] { ResolutionCandidate@6727 }
+    <name not found> = ArrayList@6728[1] { ResolutionCandidate@6727 }
+}
+
+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@6737 {
+    <name not found> = ArrayList@6738[1] { ResolutionCandidate@6739 }
+    <name not found> = ArrayList@6740[1] { ResolutionCandidate@6739 }
+}
+
+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@6749 {
+    <name not found> = ArrayList@6750[1] { ResolutionCandidate@6751 }
+    <name not found> = ArrayList@6752[1] { ResolutionCandidate@6751 }
+}
+
+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@6761 {
+    <name not found> = ArrayList@6762[1] { ResolutionCandidate@6763 }
+    <name not found> = ArrayList@6764[1] { ResolutionCandidate@6763 }
+}
+
+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@6773 {
+    <name not found> = ArrayList@6774[1] { ResolutionCandidate@6775 }
+    <name not found> = ArrayList@6776[1] { ResolutionCandidate@6775 }
+}
+
+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@6785 {
+    <name not found> = ArrayList@6786[1] { ResolutionCandidate@6787 }
+    <name not found> = ArrayList@6788[1] { ResolutionCandidate@6787 }
+}
+
+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@6797 {
+    <name not found> = ArrayList@6798[1] { ResolutionCandidate@6799 }
+    <name not found> = ArrayList@6800[1] { ResolutionCandidate@6799 }
+}
+
+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@6809 {
+    <name not found> = ArrayList@6810[1] { ResolutionCandidate@6811 }
+    <name not found> = ArrayList@6812[1] { ResolutionCandidate@6811 }
+}
+
+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@6821 {
+    <name not found> = ArrayList@6822[1] { ResolutionCandidate@6823 }
+    <name not found> = ArrayList@6824[1] { ResolutionCandidate@6823 }
+}
+
+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@6833 {
+    <name not found> = ArrayList@6834[1] { ResolutionCandidate@6835 }
+    <name not found> = ArrayList@6836[1] { ResolutionCandidate@6835 }
+}
+
+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@6845 {
+    <name not found> = ArrayList@6846[1] { ResolutionCandidate@6847 }
+    <name not found> = ArrayList@6848[1] { ResolutionCandidate@6847 }
+}
+
+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@6857 {
+    <name not found> = ArrayList@6858[1] { ResolutionCandidate@6859 }
+    <name not found> = ArrayList@6860[1] { ResolutionCandidate@6859 }
+}
+
+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@6869 {
+    <name not found> = ArrayList@6870[1] { ResolutionCandidate@6871 }
+    <name not found> = ArrayList@6872[1] { ResolutionCandidate@6871 }
+}
+
+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@6881 {
+    <name not found> = ArrayList@6882[1] { ResolutionCandidate@6883 }
+    <name not found> = ArrayList@6884[1] { ResolutionCandidate@6883 }
+}
+
+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@6893 {
+    <name not found> = ArrayList@6894[1] { ResolutionCandidate@6895 }
+    <name not found> = ArrayList@6896[1] { ResolutionCandidate@6895 }
+}
+
+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@6905 {
+    <name not found> = ArrayList@6906[1] { ResolutionCandidate@6907 }
+    <name not found> = ArrayList@6908[1] { ResolutionCandidate@6907 }
+}
+
+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@6917 {
+    <name not found> = ArrayList@6918[1] { ResolutionCandidate@6919 }
+    <name not found> = ArrayList@6920[1] { ResolutionCandidate@6919 }
+}
+
+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@6929 {
+    <name not found> = ArrayList@6930[1] { ResolutionCandidate@6931 }
+    <name not found> = ArrayList@6932[1] { ResolutionCandidate@6931 }
+}
+
+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@6941 {
+    <name not found> = ArrayList@6942[1] { ResolutionCandidate@6943 }
+    <name not found> = ArrayList@6944[1] { ResolutionCandidate@6943 }
+}
+
+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@6953 {
+    <name not found> = ArrayList@6954[1] { ResolutionCandidate@6955 }
+    <name not found> = ArrayList@6956[1] { ResolutionCandidate@6955 }
+}
+
+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@6965 {
+    <name not found> = ArrayList@6966[1] { ResolutionCandidate@6967 }
+    <name not found> = ArrayList@6968[1] { ResolutionCandidate@6967 }
+}
+
+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@6977 {
+    <name not found> = ArrayList@6978[1] { ResolutionCandidate@6979 }
+    <name not found> = ArrayList@6980[1] { ResolutionCandidate@6979 }
+}
+
+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@6989 {
+    <name not found> = ArrayList@6990[1] { ResolutionCandidate@6991 }
+    <name not found> = ArrayList@6992[1] { ResolutionCandidate@6991 }
+}
+
+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@7001 {
+    <name not found> = ArrayList@7002[1] { ResolutionCandidate@7003 }
+    <name not found> = ArrayList@7004[1] { ResolutionCandidate@7003 }
+}
+
+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@7013 {
+    <name not found> = ArrayList@7014[1] { ResolutionCandidate@7015 }
+    <name not found> = ArrayList@7016[1] { ResolutionCandidate@7015 }
+}
+
+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@7025 {
+    <name not found> = ArrayList@7026[1] { ResolutionCandidate@7027 }
+    <name not found> = ArrayList@7028[1] { ResolutionCandidate@7027 }
+}
+
+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@7037 {
+    <name not found> = ArrayList@7038[1] { ResolutionCandidate@7039 }
+    <name not found> = ArrayList@7040[1] { ResolutionCandidate@7039 }
+}
+
+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@7049 {
+    <name not found> = ArrayList@7050[1] { ResolutionCandidate@7051 }
+    <name not found> = ArrayList@7052[1] { ResolutionCandidate@7051 }
+}
+
+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@7061 {
+    <name not found> = ArrayList@7062[1] { ResolutionCandidate@7063 }
+    <name not found> = ArrayList@7064[1] { ResolutionCandidate@7063 }
+}
+
+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@7073 {
+    <name not found> = ArrayList@7074[1] { ResolutionCandidate@7075 }
+    <name not found> = ArrayList@7076[1] { ResolutionCandidate@7075 }
+}
+
+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@7085 {
+    <name not found> = ArrayList@7086[1] { ResolutionCandidate@7087 }
+    <name not found> = ArrayList@7088[1] { ResolutionCandidate@7087 }
+}
+
+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@7097 {
+    <name not found> = ArrayList@7098[1] { ResolutionCandidate@7099 }
+    <name not found> = ArrayList@7100[1] { ResolutionCandidate@7099 }
+}
+
+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@7109 {
+    <name not found> = ArrayList@7110[1] { ResolutionCandidate@7111 }
+    <name not found> = ArrayList@7112[1] { ResolutionCandidate@7111 }
+}
+
+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@7121 {
+    <name not found> = ArrayList@7122[1] { ResolutionCandidate@7123 }
+    <name not found> = ArrayList@7124[1] { ResolutionCandidate@7123 }
+}
+
+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@7133 {
+    <name not found> = ArrayList@7134[1] { ResolutionCandidate@7135 }
+    <name not found> = ArrayList@7136[1] { ResolutionCandidate@7135 }
+}
+
+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@7145 {
+    <name not found> = ArrayList@7146[1] { ResolutionCandidate@7147 }
+    <name not found> = ArrayList@7148[1] { ResolutionCandidate@7147 }
+}
+
+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@7157 {
+    <name not found> = ArrayList@7158[1] { ResolutionCandidate@7159 }
+    <name not found> = ArrayList@7160[1] { ResolutionCandidate@7159 }
+}
+
+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@7169 {
+    <name not found> = ArrayList@7170[1] { ResolutionCandidate@7171 }
+    <name not found> = ArrayList@7172[1] { ResolutionCandidate@7171 }
+}
+
+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@7181 {
+    <name not found> = ArrayList@7182[1] { ResolutionCandidate@7183 }
+    <name not found> = ArrayList@7184[1] { ResolutionCandidate@7183 }
+}
+
+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@7193 {
+    <name not found> = ArrayList@7194[1] { ResolutionCandidate@7195 }
+    <name not found> = ArrayList@7196[1] { ResolutionCandidate@7195 }
+}
+
+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@7205 {
+    <name not found> = ArrayList@7206[1] { ResolutionCandidate@7207 }
+    <name not found> = ArrayList@7208[1] { ResolutionCandidate@7207 }
+}
+
+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@7217 {
+    <name not found> = ArrayList@7218[1] { ResolutionCandidate@7219 }
+    <name not found> = ArrayList@7220[1] { ResolutionCandidate@7219 }
+}
+
+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@7229 {
+    <name not found> = ArrayList@7230[1] { ResolutionCandidate@7231 }
+    <name not found> = ArrayList@7232[1] { ResolutionCandidate@7231 }
+}
+
+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@7241 {
+    <name not found> = ArrayList@7242[1] { ResolutionCandidate@7243 }
+    <name not found> = ArrayList@7244[1] { ResolutionCandidate@7243 }
+}
+
+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@7253 {
+    <name not found> = ArrayList@7254[1] { ResolutionCandidate@7255 }
+    <name not found> = ArrayList@7256[1] { ResolutionCandidate@7255 }
+}
+
+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@7265 {
+    <name not found> = ArrayList@7266[1] { ResolutionCandidate@7267 }
+    <name not found> = ArrayList@7268[1] { ResolutionCandidate@7267 }
+}
+
+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@7277 {
+    <name not found> = ArrayList@7278[1] { ResolutionCandidate@7279 }
+    <name not found> = ArrayList@7280[1] { ResolutionCandidate@7279 }
+}
+
+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@7289 {
+    <name not found> = ArrayList@7290[1] { ResolutionCandidate@7291 }
+    <name not found> = ArrayList@7292[1] { ResolutionCandidate@7291 }
+}
+
+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@7301 {
+    <name not found> = ArrayList@7302[1] { ResolutionCandidate@7303 }
+    <name not found> = ArrayList@7304[1] { ResolutionCandidate@7303 }
+}
+
+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@7313 {
+    <name not found> = ArrayList@7314[1] { ResolutionCandidate@7315 }
+    <name not found> = ArrayList@7316[1] { ResolutionCandidate@7315 }
+}
+
+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@7325 {
+    <name not found> = ArrayList@7326[1] { ResolutionCandidate@7327 }
+    <name not found> = ArrayList@7328[1] { ResolutionCandidate@7327 }
+}
+
+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@7337 {
+    <name not found> = ArrayList@7338[1] { ResolutionCandidate@7339 }
+    <name not found> = ArrayList@7340[1] { ResolutionCandidate@7339 }
+}
+
+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@7349 {
+    <name not found> = ArrayList@7350[1] { ResolutionCandidate@7351 }
+    <name not found> = ArrayList@7352[1] { ResolutionCandidate@7351 }
+}
+
+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@7361 {
+    <name not found> = ArrayList@7362[1] { ResolutionCandidate@7363 }
+    <name not found> = ArrayList@7364[1] { ResolutionCandidate@7363 }
+}
+
+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@7373 {
+    <name not found> = ArrayList@7374[1] { ResolutionCandidate@7375 }
+    <name not found> = ArrayList@7376[1] { ResolutionCandidate@7375 }
+}
+
+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@7385 {
+    <name not found> = ArrayList@7386[1] { ResolutionCandidate@7387 }
+    <name not found> = ArrayList@7388[1] { ResolutionCandidate@7387 }
+}
+
+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@7397 {
+    <name not found> = ArrayList@7398[1] { ResolutionCandidate@7399 }
+    <name not found> = ArrayList@7400[1] { ResolutionCandidate@7399 }
+}
+
+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@7409 {
+    <name not found> = ArrayList@7410[1] { ResolutionCandidate@7411 }
+    <name not found> = ArrayList@7412[1] { ResolutionCandidate@7411 }
+}
+
+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@7421 {
+    <name not found> = ArrayList@7422[1] { ResolutionCandidate@7423 }
+    <name not found> = ArrayList@7424[1] { ResolutionCandidate@7423 }
+}
+
+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@7433 {
+    <name not found> = ArrayList@7434[1] { ResolutionCandidate@7435 }
+    <name not found> = ArrayList@7436[1] { ResolutionCandidate@7435 }
+}
+
+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@7445 {
+    <name not found> = ArrayList@7446[1] { ResolutionCandidate@7447 }
+    <name not found> = ArrayList@7448[1] { ResolutionCandidate@7447 }
+}
+
+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@7457 {
+    <name not found> = ArrayList@7458[1] { ResolutionCandidate@7459 }
+    <name not found> = ArrayList@7460[1] { ResolutionCandidate@7459 }
+}
+
+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@7469 {
+    <name not found> = ArrayList@7470[1] { ResolutionCandidate@7471 }
+    <name not found> = ArrayList@7472[1] { ResolutionCandidate@7471 }
+}
+
+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@7481 {
+    <name not found> = ArrayList@7482[1] { ResolutionCandidate@7483 }
+    <name not found> = ArrayList@7484[1] { ResolutionCandidate@7483 }
+}
+
+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@7493 {
+    <name not found> = ArrayList@7494[1] { ResolutionCandidate@7495 }
+    <name not found> = ArrayList@7496[1] { ResolutionCandidate@7495 }
+}
+
+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@7505 {
+    <name not found> = ArrayList@7506[1] { ResolutionCandidate@7507 }
+    <name not found> = ArrayList@7508[1] { ResolutionCandidate@7507 }
+}
+
+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@7517 {
+    <name not found> = ArrayList@7518[1] { ResolutionCandidate@7519 }
+    <name not found> = ArrayList@7520[1] { ResolutionCandidate@7519 }
+}
+
+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@7529 {
+    <name not found> = ArrayList@7530[1] { ResolutionCandidate@7531 }
+    <name not found> = ArrayList@7532[1] { ResolutionCandidate@7531 }
+}
+
+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@7541 {
+    <name not found> = ArrayList@7542[1] { ResolutionCandidate@7543 }
+    <name not found> = ArrayList@7544[1] { ResolutionCandidate@7543 }
+}
+
+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@7553 {
+    <name not found> = ArrayList@7554[1] { ResolutionCandidate@7555 }
+    <name not found> = ArrayList@7556[1] { ResolutionCandidate@7555 }
+}
+
+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@7565 {
+    <name not found> = ArrayList@7566[1] { ResolutionCandidate@7567 }
+    <name not found> = ArrayList@7568[1] { ResolutionCandidate@7567 }
+}
+
+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@7577 {
+    <name not found> = ArrayList@7578[1] { ResolutionCandidate@7579 }
+    <name not found> = ArrayList@7580[1] { ResolutionCandidate@7579 }
+}
+
+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@7589 {
+    <name not found> = ArrayList@7590[1] { ResolutionCandidate@7591 }
+    <name not found> = ArrayList@7592[1] { ResolutionCandidate@7591 }
+}
+
+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@7601 {
+    <name not found> = ArrayList@7602[1] { ResolutionCandidate@7603 }
+    <name not found> = ArrayList@7604[1] { ResolutionCandidate@7603 }
+}
+
+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@7613 {
+    <name not found> = ArrayList@7614[1] { ResolutionCandidate@7615 }
+    <name not found> = ArrayList@7616[1] { ResolutionCandidate@7615 }
+}
+
+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@7625 {
+    <name not found> = ArrayList@7626[1] { ResolutionCandidate@7627 }
+    <name not found> = ArrayList@7628[1] { ResolutionCandidate@7627 }
+}
+
+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@7637 {
+    <name not found> = ArrayList@7638[1] { ResolutionCandidate@7639 }
+    <name not found> = ArrayList@7640[1] { ResolutionCandidate@7639 }
+}
+
+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@7649 {
+    <name not found> = ArrayList@7650[1] { ResolutionCandidate@7651 }
+    <name not found> = ArrayList@7652[1] { ResolutionCandidate@7651 }
+}
+
+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@7661 {
+    <name not found> = ArrayList@7662[1] { ResolutionCandidate@7663 }
+    <name not found> = ArrayList@7664[1] { ResolutionCandidate@7663 }
+}
+
+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@7673 {
+    <name not found> = ArrayList@7674[1] { ResolutionCandidate@7675 }
+    <name not found> = ArrayList@7676[1] { ResolutionCandidate@7675 }
+}
+
+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@7685 {
+    <name not found> = ArrayList@7686[1] { ResolutionCandidate@7687 }
+    <name not found> = ArrayList@7688[1] { ResolutionCandidate@7687 }
+}
+
+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@7697 {
+    <name not found> = ArrayList@7698[1] { ResolutionCandidate@7699 }
+    <name not found> = ArrayList@7700[1] { ResolutionCandidate@7699 }
+}
+
+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@7709 {
+    <name not found> = ArrayList@7710[1] { ResolutionCandidate@7711 }
+    <name not found> = ArrayList@7712[1] { ResolutionCandidate@7711 }
+}
+
+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@7721 {
+    <name not found> = ArrayList@7722[1] { ResolutionCandidate@7723 }
+    <name not found> = ArrayList@7724[1] { ResolutionCandidate@7723 }
+}
+
+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@7733 {
+    <name not found> = ArrayList@7734[1] { ResolutionCandidate@7735 }
+    <name not found> = ArrayList@7736[1] { ResolutionCandidate@7735 }
+}
+
+ResolutionTaskHolder@7737 {
+    <name not found> = ArrayList@7738[1] { ResolutionCandidate@7739 }
+    <name not found> = ArrayList@7740[1] { ResolutionCandidate@7739 }
+}
+
+ResolutionTaskHolder@7741 {
+    <name not found> = ArrayList@7742[1] { ResolutionCandidate@7743 }
+    <name not found> = ArrayList@7744[1] { ResolutionCandidate@7743 }
+}
+
+ResolutionTaskHolder@7745 {
+    <name not found> = ArrayList@7746[1] { ResolutionCandidate@7747 }
+    <name not found> = ArrayList@7748[1] { ResolutionCandidate@7747 }
+}
+
+ResolutionTaskHolder@7749 {
+    <name not found> = ArrayList@7750[1] { ResolutionCandidate@7751 }
+    <name not found> = ArrayList@7752[1] { ResolutionCandidate@7751 }
+}
+
+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@7761 {
+    <name not found> = ArrayList@7762[1] { ResolutionCandidate@7763 }
+    <name not found> = ArrayList@7764[1] { ResolutionCandidate@7763 }
+}
+
+ResolutionTaskHolder@7765 {
+    <name not found> = ArrayList@7766[1] { ResolutionCandidate@7767 }
+    <name not found> = ArrayList@7768[1] { ResolutionCandidate@7767 }
+}
+
+ResolutionTaskHolder@7769 {
+    <name not found> = ArrayList@7770[1] { ResolutionCandidate@7771 }
+    <name not found> = ArrayList@7772[1] { ResolutionCandidate@7771 }
+}
+
+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@7781 {
+    <name not found> = ArrayList@7782[1] { ResolutionCandidate@7783 }
+    <name not found> = ArrayList@7784[1] { ResolutionCandidate@7783 }
+}
+
+ResolutionTaskHolder@7785 {
+    <name not found> = ArrayList@7786[1] { ResolutionCandidate@7787 }
+    <name not found> = ArrayList@7788[1] { ResolutionCandidate@7787 }
+}
+
+ResolutionTaskHolder@7789 {
+    <name not found> = ArrayList@7790[1] { ResolutionCandidate@7791 }
+    <name not found> = ArrayList@7792[1] { ResolutionCandidate@7791 }
+}
+
+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@7801 {
+    <name not found> = ArrayList@7802[1] { ResolutionCandidate@7803 }
+    <name not found> = ArrayList@7804[1] { ResolutionCandidate@7803 }
+}
+
+ResolutionTaskHolder@7805 {
+    <name not found> = ArrayList@7806[1] { ResolutionCandidate@7807 }
+    <name not found> = ArrayList@7808[1] { ResolutionCandidate@7807 }
+}
+
+ResolutionTaskHolder@7809 {
+    <name not found> = ArrayList@7810[1] { ResolutionCandidate@7811 }
+    <name not found> = ArrayList@7812[1] { ResolutionCandidate@7811 }
+}
+
+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@7821 {
+    <name not found> = ArrayList@7822[1] { ResolutionCandidate@7823 }
+    <name not found> = ArrayList@7824[1] { ResolutionCandidate@7823 }
+}
+
+ResolutionTaskHolder@7825 {
+    <name not found> = ArrayList@7826[1] { ResolutionCandidate@7827 }
+    <name not found> = ArrayList@7828[1] { ResolutionCandidate@7827 }
+}
+
+ResolutionTaskHolder@7829 {
+    <name not found> = ArrayList@7830[1] { ResolutionCandidate@7831 }
+    <name not found> = ArrayList@7832[1] { ResolutionCandidate@7831 }
+}
+
+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@7841 {
+    <name not found> = ArrayList@7842[1] { ResolutionCandidate@7843 }
+    <name not found> = ArrayList@7844[1] { ResolutionCandidate@7843 }
+}
+
+ResolutionTaskHolder@7845 {
+    <name not found> = ArrayList@7846[1] { ResolutionCandidate@7847 }
+    <name not found> = ArrayList@7848[1] { ResolutionCandidate@7847 }
+}
+
+ResolutionTaskHolder@7849 {
+    <name not found> = ArrayList@7850[1] { ResolutionCandidate@7851 }
+    <name not found> = ArrayList@7852[1] { ResolutionCandidate@7851 }
+}
+
+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@7861 {
+    <name not found> = ArrayList@7862[1] { ResolutionCandidate@7863 }
+    <name not found> = ArrayList@7864[1] { ResolutionCandidate@7863 }
+}
+
+ResolutionTaskHolder@7865 {
+    <name not found> = ArrayList@7866[1] { ResolutionCandidate@7867 }
+    <name not found> = ArrayList@7868[1] { ResolutionCandidate@7867 }
+}
+
+ResolutionTaskHolder@7869 {
+    <name not found> = ArrayList@7870[1] { ResolutionCandidate@7871 }
+    <name not found> = ArrayList@7872[1] { ResolutionCandidate@7871 }
+}
+
+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@7881 {
+    <name not found> = ArrayList@7882[1] { ResolutionCandidate@7883 }
+    <name not found> = ArrayList@7884[1] { ResolutionCandidate@7883 }
+}
+
+ResolutionTaskHolder@7885 {
+    <name not found> = ArrayList@7886[1] { ResolutionCandidate@7887 }
+    <name not found> = ArrayList@7888[1] { ResolutionCandidate@7887 }
+}
+
+ResolutionTaskHolder@7889 {
+    <name not found> = ArrayList@7890[1] { ResolutionCandidate@7891 }
+    <name not found> = ArrayList@7892[1] { ResolutionCandidate@7891 }
+}
+
+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@7901 {
+    <name not found> = ArrayList@7902[1] { ResolutionCandidate@7903 }
+    <name not found> = ArrayList@7904[1] { ResolutionCandidate@7903 }
+}
+
+ResolutionTaskHolder@7905 {
+    <name not found> = ArrayList@7906[1] { ResolutionCandidate@7907 }
+    <name not found> = ArrayList@7908[1] { ResolutionCandidate@7907 }
+}
+
+ResolutionTaskHolder@7909 {
+    <name not found> = ArrayList@7910[1] { ResolutionCandidate@7911 }
+    <name not found> = ArrayList@7912[1] { ResolutionCandidate@7911 }
+}
+
+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@7921 {
+    <name not found> = ArrayList@7922[1] { ResolutionCandidate@7923 }
+    <name not found> = ArrayList@7924[1] { ResolutionCandidate@7923 }
+}
+
+ResolutionTaskHolder@7925 {
+    <name not found> = ArrayList@7926[1] { ResolutionCandidate@7927 }
+    <name not found> = ArrayList@7928[1] { ResolutionCandidate@7927 }
+}
+
+ResolutionTaskHolder@7929 {
+    <name not found> = ArrayList@7930[1] { ResolutionCandidate@7931 }
+    <name not found> = ArrayList@7932[1] { ResolutionCandidate@7931 }
+}
+
+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@7941 {
+    <name not found> = ArrayList@7942[1] { ResolutionCandidate@7943 }
+    <name not found> = ArrayList@7944[1] { ResolutionCandidate@7943 }
+}
+
+ResolutionTaskHolder@7945 {
+    <name not found> = ArrayList@7946[1] { ResolutionCandidate@7947 }
+    <name not found> = ArrayList@7948[1] { ResolutionCandidate@7947 }
+}
+
+ResolutionTaskHolder@7949 {
+    <name not found> = ArrayList@7950[1] { ResolutionCandidate@7951 }
+    <name not found> = ArrayList@7952[1] { ResolutionCandidate@7951 }
+}
+
+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@7961 {
+    <name not found> = ArrayList@7962[1] { ResolutionCandidate@7963 }
+    <name not found> = ArrayList@7964[1] { ResolutionCandidate@7963 }
+}
+
+ResolutionTaskHolder@7965 {
+    <name not found> = ArrayList@7966[1] { ResolutionCandidate@7967 }
+    <name not found> = ArrayList@7968[1] { ResolutionCandidate@7967 }
+}
+
+ResolutionTaskHolder@7969 {
+    <name not found> = ArrayList@7970[1] { ResolutionCandidate@7971 }
+    <name not found> = ArrayList@7972[1] { ResolutionCandidate@7971 }
+}
+
+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@7981 {
+    <name not found> = ArrayList@7982[1] { ResolutionCandidate@7983 }
+    <name not found> = ArrayList@7984[1] { ResolutionCandidate@7983 }
+}
+
+ResolutionTaskHolder@7985 {
+    <name not found> = ArrayList@7986[1] { ResolutionCandidate@7987 }
+    <name not found> = ArrayList@7988[1] { ResolutionCandidate@7987 }
+}
+
+ResolutionTaskHolder@7989 {
+    <name not found> = ArrayList@7990[1] { ResolutionCandidate@7991 }
+    <name not found> = ArrayList@7992[1] { ResolutionCandidate@7991 }
+}
+
+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@8001 {
+    <name not found> = ArrayList@8002[1] { ResolutionCandidate@8003 }
+    <name not found> = ArrayList@8004[1] { ResolutionCandidate@8003 }
+}
+
+ResolutionTaskHolder@8005 {
+    <name not found> = ArrayList@8006[1] { ResolutionCandidate@8007 }
+    <name not found> = ArrayList@8008[1] { ResolutionCandidate@8007 }
+}
+
+ResolutionTaskHolder@8009 {
+    <name not found> = ArrayList@8010[1] { ResolutionCandidate@8011 }
+    <name not found> = ArrayList@8012[1] { ResolutionCandidate@8011 }
+}
+
+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@8021 {
+    <name not found> = ArrayList@8022[1] { ResolutionCandidate@8023 }
+    <name not found> = ArrayList@8024[1] { ResolutionCandidate@8023 }
+}
+
+ResolutionTaskHolder@8025 {
+    <name not found> = ArrayList@8026[1] { ResolutionCandidate@8027 }
+    <name not found> = ArrayList@8028[1] { ResolutionCandidate@8027 }
+}
+
+ResolutionTaskHolder@8029 {
+    <name not found> = ArrayList@8030[1] { ResolutionCandidate@8031 }
+    <name not found> = ArrayList@8032[1] { ResolutionCandidate@8031 }
+}
+
+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@8041 {
+    <name not found> = ArrayList@8042[1] { ResolutionCandidate@8043 }
+    <name not found> = ArrayList@8044[1] { ResolutionCandidate@8043 }
+}
+
+ResolutionTaskHolder@8045 {
+    <name not found> = ArrayList@8046[1] { ResolutionCandidate@8047 }
+    <name not found> = ArrayList@8048[1] { ResolutionCandidate@8047 }
+}
+
+ResolutionTaskHolder@8049 {
+    <name not found> = ArrayList@8050[1] { ResolutionCandidate@8051 }
+    <name not found> = ArrayList@8052[1] { ResolutionCandidate@8051 }
+}
+
+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@8061 {
+    <name not found> = ArrayList@8062[1] { ResolutionCandidate@8063 }
+    <name not found> = ArrayList@8064[1] { ResolutionCandidate@8063 }
+}
+
+ResolutionTaskHolder@8065 {
+    <name not found> = ArrayList@8066[1] { ResolutionCandidate@8067 }
+    <name not found> = ArrayList@8068[1] { ResolutionCandidate@8067 }
+}
+
+ResolutionTaskHolder@8069 {
+    <name not found> = ArrayList@8070[1] { ResolutionCandidate@8071 }
+    <name not found> = ArrayList@8072[1] { ResolutionCandidate@8071 }
+}
+
+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@8081 {
+    <name not found> = ArrayList@8082[1] { ResolutionCandidate@8083 }
+    <name not found> = ArrayList@8084[1] { ResolutionCandidate@8083 }
+}
+
+ResolutionTaskHolder@8085 {
+    <name not found> = ArrayList@8086[1] { ResolutionCandidate@8087 }
+    <name not found> = ArrayList@8088[1] { ResolutionCandidate@8087 }
+}
+
+ResolutionTaskHolder@8089 {
+    <name not found> = ArrayList@8090[1] { ResolutionCandidate@8091 }
+    <name not found> = ArrayList@8092[1] { ResolutionCandidate@8091 }
+}
+
+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@8101 {
+    <name not found> = ArrayList@8102[1] { ResolutionCandidate@8103 }
+    <name not found> = ArrayList@8104[1] { ResolutionCandidate@8103 }
+}
+
+ResolutionTaskHolder@8105 {
+    <name not found> = ArrayList@8106[1] { ResolutionCandidate@8107 }
+    <name not found> = ArrayList@8108[1] { ResolutionCandidate@8107 }
+}
+
+ResolutionTaskHolder@8109 {
+    <name not found> = ArrayList@8110[1] { ResolutionCandidate@8111 }
+    <name not found> = ArrayList@8112[1] { ResolutionCandidate@8111 }
+}
+
+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@8121 {
+    <name not found> = ArrayList@8122[1] { ResolutionCandidate@8123 }
+    <name not found> = ArrayList@8124[1] { ResolutionCandidate@8123 }
+}
+
+ResolutionTaskHolder@8125 {
+    <name not found> = ArrayList@8126[1] { ResolutionCandidate@8127 }
+    <name not found> = ArrayList@8128[1] { ResolutionCandidate@8127 }
+}
+
+ResolutionTaskHolder@8129 {
+    <name not found> = ArrayList@8130[1] { ResolutionCandidate@8131 }
+    <name not found> = ArrayList@8132[1] { ResolutionCandidate@8131 }
+}
+
+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@8141 {
+    <name not found> = ArrayList@8142[1] { ResolutionCandidate@8143 }
+    <name not found> = ArrayList@8144[1] { ResolutionCandidate@8143 }
+}
+
+ResolutionTaskHolder@8145 {
+    <name not found> = ArrayList@8146[1] { ResolutionCandidate@8147 }
+    <name not found> = ArrayList@8148[1] { ResolutionCandidate@8147 }
+}
+
+ResolutionTaskHolder@8149 {
+    <name not found> = ArrayList@8150[1] { ResolutionCandidate@8151 }
+    <name not found> = ArrayList@8152[1] { ResolutionCandidate@8151 }
+}
+
+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@8161 {
+    <name not found> = ArrayList@8162[1] { ResolutionCandidate@8163 }
+    <name not found> = ArrayList@8164[1] { ResolutionCandidate@8163 }
+}
+
+ResolutionTaskHolder@8165 {
+    <name not found> = ArrayList@8166[1] { ResolutionCandidate@8167 }
+    <name not found> = ArrayList@8168[1] { ResolutionCandidate@8167 }
+}
+
+ResolutionTaskHolder@8169 {
+    <name not found> = ArrayList@8170[1] { ResolutionCandidate@8171 }
+    <name not found> = ArrayList@8172[1] { ResolutionCandidate@8171 }
+}
+
+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@8181 {
+    <name not found> = ArrayList@8182[1] { ResolutionCandidate@8183 }
+    <name not found> = ArrayList@8184[1] { ResolutionCandidate@8183 }
+}
+
+ResolutionTaskHolder@8185 {
+    <name not found> = ArrayList@8186[1] { ResolutionCandidate@8187 }
+    <name not found> = ArrayList@8188[1] { ResolutionCandidate@8187 }
+}
+
+ResolutionTaskHolder@8189 {
+    <name not found> = ArrayList@8190[1] { ResolutionCandidate@8191 }
+    <name not found> = ArrayList@8192[1] { ResolutionCandidate@8191 }
+}
+
+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@8201 {
+    <name not found> = ArrayList@8202[1] { ResolutionCandidate@8203 }
+    <name not found> = ArrayList@8204[1] { ResolutionCandidate@8203 }
+}
+
+ResolutionTaskHolder@8205 {
+    <name not found> = ArrayList@8206[1] { ResolutionCandidate@8207 }
+    <name not found> = ArrayList@8208[1] { ResolutionCandidate@8207 }
+}
+
+ResolutionTaskHolder@8209 {
+    <name not found> = ArrayList@8210[1] { ResolutionCandidate@8211 }
+    <name not found> = ArrayList@8212[1] { ResolutionCandidate@8211 }
+}
+
+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@8221 {
+    <name not found> = ArrayList@8222[1] { ResolutionCandidate@8223 }
+    <name not found> = ArrayList@8224[1] { ResolutionCandidate@8223 }
+}
+
+ResolutionTaskHolder@8225 {
+    <name not found> = ArrayList@8226[1] { ResolutionCandidate@8227 }
+    <name not found> = ArrayList@8228[1] { ResolutionCandidate@8227 }
+}
+
+ResolutionTaskHolder@8229 {
+    <name not found> = ArrayList@8230[1] { ResolutionCandidate@8231 }
+    <name not found> = ArrayList@8232[1] { ResolutionCandidate@8231 }
+}
+
+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@8241 {
+    <name not found> = ArrayList@8242[1] { ResolutionCandidate@8243 }
+    <name not found> = ArrayList@8244[1] { ResolutionCandidate@8243 }
+}
+
+ResolutionTaskHolder@8245 {
+    <name not found> = ArrayList@8246[1] { ResolutionCandidate@8247 }
+    <name not found> = ArrayList@8248[1] { ResolutionCandidate@8247 }
+}
+
+ResolutionTaskHolder@8249 {
+    <name not found> = ArrayList@8250[1] { ResolutionCandidate@8251 }
+    <name not found> = ArrayList@8252[1] { ResolutionCandidate@8251 }
+}
+
+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@8261 {
+    <name not found> = ArrayList@8262[1] { ResolutionCandidate@8263 }
+    <name not found> = ArrayList@8264[1] { ResolutionCandidate@8263 }
+}
+
+ResolutionTaskHolder@8265 {
+    <name not found> = ArrayList@8266[1] { ResolutionCandidate@8267 }
+    <name not found> = ArrayList@8268[1] { ResolutionCandidate@8267 }
+}
+
+ResolutionTaskHolder@8269 {
+    <name not found> = ArrayList@8270[1] { ResolutionCandidate@8271 }
+    <name not found> = ArrayList@8272[1] { ResolutionCandidate@8271 }
+}
+
+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@8281 {
+    <name not found> = ArrayList@8282[1] { ResolutionCandidate@8283 }
+    <name not found> = ArrayList@8284[1] { ResolutionCandidate@8283 }
+}
+
+ResolutionTaskHolder@8285 {
+    <name not found> = ArrayList@8286[1] { ResolutionCandidate@8287 }
+    <name not found> = ArrayList@8288[1] { ResolutionCandidate@8287 }
+}
+
+ResolutionTaskHolder@8289 {
+    <name not found> = ArrayList@8290[1] { ResolutionCandidate@8291 }
+    <name not found> = ArrayList@8292[1] { ResolutionCandidate@8291 }
+}
+
+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@8301 {
+    <name not found> = ArrayList@8302[1] { ResolutionCandidate@8303 }
+    <name not found> = ArrayList@8304[1] { ResolutionCandidate@8303 }
+}
+
+ResolutionTaskHolder@8305 {
+    <name not found> = ArrayList@8306[1] { ResolutionCandidate@8307 }
+    <name not found> = ArrayList@8308[1] { ResolutionCandidate@8307 }
+}
+
+ResolutionTaskHolder@8309 {
+    <name not found> = ArrayList@8310[1] { ResolutionCandidate@8311 }
+    <name not found> = ArrayList@8312[1] { ResolutionCandidate@8311 }
+}
+
+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@8321 {
+    <name not found> = ArrayList@8322[1] { ResolutionCandidate@8323 }
+    <name not found> = ArrayList@8324[1] { ResolutionCandidate@8323 }
+}
+
+ResolutionTaskHolder@8325 {
+    <name not found> = ArrayList@8326[1] { ResolutionCandidate@8327 }
+    <name not found> = ArrayList@8328[1] { ResolutionCandidate@8327 }
+}
+
+ResolutionTaskHolder@8329 {
+    <name not found> = ArrayList@8330[1] { ResolutionCandidate@8331 }
+    <name not found> = ArrayList@8332[1] { ResolutionCandidate@8331 }
+}
+
+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@8341 {
+    <name not found> = ArrayList@8342[1] { ResolutionCandidate@8343 }
+    <name not found> = ArrayList@8344[1] { ResolutionCandidate@8343 }
+}
+
+ResolutionTaskHolder@8345 {
+    <name not found> = ArrayList@8346[1] { ResolutionCandidate@8347 }
+    <name not found> = ArrayList@8348[1] { ResolutionCandidate@8347 }
+}
+
+ResolutionTaskHolder@8349 {
+    <name not found> = ArrayList@8350[1] { ResolutionCandidate@8351 }
+    <name not found> = ArrayList@8352[1] { ResolutionCandidate@8351 }
+}
+
+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@8361 {
+    <name not found> = ArrayList@8362[1] { ResolutionCandidate@8363 }
+    <name not found> = ArrayList@8364[1] { ResolutionCandidate@8363 }
+}
+
+ResolutionTaskHolder@8365 {
+    <name not found> = ArrayList@8366[1] { ResolutionCandidate@8367 }
+    <name not found> = ArrayList@8368[1] { ResolutionCandidate@8367 }
+}
+
+ResolutionTaskHolder@8369 {
+    <name not found> = ArrayList@8370[1] { ResolutionCandidate@8371 }
+    <name not found> = ArrayList@8372[1] { ResolutionCandidate@8371 }
+}
+
+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@8381 {
+    <name not found> = ArrayList@8382[1] { ResolutionCandidate@8383 }
+    <name not found> = ArrayList@8384[1] { ResolutionCandidate@8383 }
+}
+
+ResolutionTaskHolder@8385 {
+    <name not found> = ArrayList@8386[1] { ResolutionCandidate@8387 }
+    <name not found> = ArrayList@8388[1] { ResolutionCandidate@8387 }
+}
+
+ResolutionTaskHolder@8389 {
+    <name not found> = ArrayList@8390[1] { ResolutionCandidate@8391 }
+    <name not found> = ArrayList@8392[1] { ResolutionCandidate@8391 }
+}
+
+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@8401 {
+    <name not found> = ArrayList@8402[1] { ResolutionCandidate@8403 }
+    <name not found> = ArrayList@8404[1] { ResolutionCandidate@8403 }
+}
+
+ResolutionTaskHolder@8405 {
+    <name not found> = ArrayList@8406[1] { ResolutionCandidate@8407 }
+    <name not found> = ArrayList@8408[1] { ResolutionCandidate@8407 }
+}
+
+ResolutionTaskHolder@8409 {
+    <name not found> = ArrayList@8410[1] { ResolutionCandidate@8411 }
+    <name not found> = ArrayList@8412[1] { ResolutionCandidate@8411 }
+}
+
+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@8421 {
+    <name not found> = ArrayList@8422[1] { ResolutionCandidate@8423 }
+    <name not found> = ArrayList@8424[1] { ResolutionCandidate@8423 }
+}
+
+ResolutionTaskHolder@8425 {
+    <name not found> = ArrayList@8426[1] { ResolutionCandidate@8427 }
+    <name not found> = ArrayList@8428[1] { ResolutionCandidate@8427 }
+}
+
+ResolutionTaskHolder@8429 {
+    <name not found> = ArrayList@8430[1] { ResolutionCandidate@8431 }
+    <name not found> = ArrayList@8432[1] { ResolutionCandidate@8431 }
+}
+
+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@8441 {
+    <name not found> = ArrayList@8442[1] { ResolutionCandidate@8443 }
+    <name not found> = ArrayList@8444[1] { ResolutionCandidate@8443 }
+}
+
+ResolutionTaskHolder@8445 {
+    <name not found> = ArrayList@8446[1] { ResolutionCandidate@8447 }
+    <name not found> = ArrayList@8448[1] { ResolutionCandidate@8447 }
+}
+
+ResolutionTaskHolder@8449 {
+    <name not found> = ArrayList@8450[1] { ResolutionCandidate@8451 }
+    <name not found> = ArrayList@8452[1] { ResolutionCandidate@8451 }
+}
+
+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@8461 {
+    <name not found> = ArrayList@8462[1] { ResolutionCandidate@8463 }
+    <name not found> = ArrayList@8464[1] { ResolutionCandidate@8463 }
+}
+
+ResolutionTaskHolder@8465 {
+    <name not found> = ArrayList@8466[1] { ResolutionCandidate@8467 }
+    <name not found> = ArrayList@8468[1] { ResolutionCandidate@8467 }
+}
+
+ResolutionTaskHolder@8469 {
+    <name not found> = ArrayList@8470[1] { ResolutionCandidate@8471 }
+    <name not found> = ArrayList@8472[1] { ResolutionCandidate@8471 }
+}
+
+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@8481 {
+    <name not found> = ArrayList@8482[1] { ResolutionCandidate@8483 }
+    <name not found> = ArrayList@8484[1] { ResolutionCandidate@8483 }
+}
+
+ResolutionTaskHolder@8485 {
+    <name not found> = ArrayList@8486[1] { ResolutionCandidate@8487 }
+    <name not found> = ArrayList@8488[1] { ResolutionCandidate@8487 }
+}
+
+ResolutionTaskHolder@8489 {
+    <name not found> = ArrayList@8490[1] { ResolutionCandidate@8491 }
+    <name not found> = ArrayList@8492[1] { ResolutionCandidate@8491 }
+}
+
+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@8501 {
+    <name not found> = ArrayList@8502[1] { ResolutionCandidate@8503 }
+    <name not found> = ArrayList@8504[1] { ResolutionCandidate@8503 }
+}
+
+ResolutionTaskHolder@8505 {
+    <name not found> = ArrayList@8506[1] { ResolutionCandidate@8507 }
+    <name not found> = ArrayList@8508[1] { ResolutionCandidate@8507 }
+}
+
+ResolutionTaskHolder@8509 {
+    <name not found> = ArrayList@8510[1] { ResolutionCandidate@8511 }
+    <name not found> = ArrayList@8512[1] { ResolutionCandidate@8511 }
+}
+
+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@8521 {
+    <name not found> = ArrayList@8522[1] { ResolutionCandidate@8523 }
+    <name not found> = ArrayList@8524[1] { ResolutionCandidate@8523 }
+}
+
+ResolutionTaskHolder@8525 {
+    <name not found> = ArrayList@8526[1] { ResolutionCandidate@8527 }
+    <name not found> = ArrayList@8528[1] { ResolutionCandidate@8527 }
+}
+
+ResolutionTaskHolder@8529 {
+    <name not found> = ArrayList@8530[1] { ResolutionCandidate@8531 }
+    <name not found> = ArrayList@8532[1] { ResolutionCandidate@8531 }
+}
+
+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@8541 {
+    <name not found> = ArrayList@8542[1] { ResolutionCandidate@8543 }
+    <name not found> = ArrayList@8544[1] { ResolutionCandidate@8543 }
+}
+
+ResolutionTaskHolder@8545 {
+    <name not found> = ArrayList@8546[1] { ResolutionCandidate@8547 }
+    <name not found> = ArrayList@8548[1] { ResolutionCandidate@8547 }
+}
+
+ResolutionTaskHolder@8549 {
+    <name not found> = ArrayList@8550[1] { ResolutionCandidate@8551 }
+    <name not found> = ArrayList@8552[1] { ResolutionCandidate@8551 }
+}
+
+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@8561 {
+    <name not found> = ArrayList@8562[1] { ResolutionCandidate@8563 }
+    <name not found> = ArrayList@8564[1] { ResolutionCandidate@8563 }
+}
+
+ResolutionTaskHolder@8565 {
+    <name not found> = ArrayList@8566[1] { ResolutionCandidate@8567 }
+    <name not found> = ArrayList@8568[1] { ResolutionCandidate@8567 }
+}
+
+ResolutionTaskHolder@8569 {
+    <name not found> = ArrayList@8570[1] { ResolutionCandidate@8571 }
+    <name not found> = ArrayList@8572[1] { ResolutionCandidate@8571 }
+}
+
+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@8581 {
+    <name not found> = ArrayList@8582[1] { ResolutionCandidate@8583 }
+    <name not found> = ArrayList@8584[1] { ResolutionCandidate@8583 }
+}
+
+ResolutionTaskHolder@8585 {
+    <name not found> = ArrayList@8586[1] { ResolutionCandidate@8587 }
+    <name not found> = ArrayList@8588[1] { ResolutionCandidate@8587 }
+}
+
+ResolutionTaskHolder@8589 {
+    <name not found> = ArrayList@8590[1] { ResolutionCandidate@8591 }
+    <name not found> = ArrayList@8592[1] { ResolutionCandidate@8591 }
+}
+
+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@8601 {
+    <name not found> = ArrayList@8602[1] { ResolutionCandidate@8603 }
+    <name not found> = ArrayList@8604[1] { ResolutionCandidate@8603 }
+}
+
+ResolutionTaskHolder@8605 {
+    <name not found> = ArrayList@8606[1] { ResolutionCandidate@8607 }
+    <name not found> = ArrayList@8608[1] { ResolutionCandidate@8607 }
+}
+
+ResolutionTaskHolder@8609 {
+    <name not found> = ArrayList@8610[1] { ResolutionCandidate@8611 }
+    <name not found> = ArrayList@8612[1] { ResolutionCandidate@8611 }
+}
+
+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@8621 {
+    <name not found> = ArrayList@8622[1] { ResolutionCandidate@8623 }
+    <name not found> = ArrayList@8624[1] { ResolutionCandidate@8623 }
+}
+
+ResolutionTaskHolder@8625 {
+    <name not found> = ArrayList@8626[1] { ResolutionCandidate@8627 }
+    <name not found> = ArrayList@8628[1] { ResolutionCandidate@8627 }
+}
+
+ResolutionTaskHolder@8629 {
+    <name not found> = ArrayList@8630[1] { ResolutionCandidate@8631 }
+    <name not found> = ArrayList@8632[1] { ResolutionCandidate@8631 }
+}
+
+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@8641 {
+    <name not found> = ArrayList@8642[1] { ResolutionCandidate@8643 }
+    <name not found> = ArrayList@8644[1] { ResolutionCandidate@8643 }
+}
+
+ResolutionTaskHolder@8645 {
+    <name not found> = ArrayList@8646[1] { ResolutionCandidate@8647 }
+    <name not found> = ArrayList@8648[1] { ResolutionCandidate@8647 }
+}
+
+ResolutionTaskHolder@8649 {
+    <name not found> = ArrayList@8650[1] { ResolutionCandidate@8651 }
+    <name not found> = ArrayList@8652[1] { ResolutionCandidate@8651 }
+}
+
+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@8661 {
+    <name not found> = ArrayList@8662[1] { ResolutionCandidate@8663 }
+    <name not found> = ArrayList@8664[1] { ResolutionCandidate@8663 }
+}
+
+ResolutionTaskHolder@8665 {
+    <name not found> = ArrayList@8666[1] { ResolutionCandidate@8667 }
+    <name not found> = ArrayList@8668[1] { ResolutionCandidate@8667 }
+}
+
+ResolutionTaskHolder@8669 {
+    <name not found> = ArrayList@8670[1] { ResolutionCandidate@8671 }
+    <name not found> = ArrayList@8672[1] { ResolutionCandidate@8671 }
+}
+
+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@8681 {
+    <name not found> = ArrayList@8682[1] { ResolutionCandidate@8683 }
+    <name not found> = ArrayList@8684[1] { ResolutionCandidate@8683 }
+}
+
+ResolutionTaskHolder@8685 {
+    <name not found> = ArrayList@8686[1] { ResolutionCandidate@8687 }
+    <name not found> = ArrayList@8688[1] { ResolutionCandidate@8687 }
+}
+
+ResolutionTaskHolder@8689 {
+    <name not found> = ArrayList@8690[1] { ResolutionCandidate@8691 }
+    <name not found> = ArrayList@8692[1] { ResolutionCandidate@8691 }
+}
+
+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@8701 {
+    <name not found> = ArrayList@8702[1] { ResolutionCandidate@8703 }
+    <name not found> = ArrayList@8704[1] { ResolutionCandidate@8703 }
+}
+
+ResolutionTaskHolder@8705 {
+    <name not found> = ArrayList@8706[1] { ResolutionCandidate@8707 }
+    <name not found> = ArrayList@8708[1] { ResolutionCandidate@8707 }
+}
+
+ResolutionTaskHolder@8709 {
+    <name not found> = ArrayList@8710[1] { ResolutionCandidate@8711 }
+    <name not found> = ArrayList@8712[1] { ResolutionCandidate@8711 }
+}
+
+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@8721 {
+    <name not found> = ArrayList@8722[1] { ResolutionCandidate@8723 }
+    <name not found> = ArrayList@8724[1] { ResolutionCandidate@8723 }
+}
+
+ResolutionTaskHolder@8725 {
+    <name not found> = ArrayList@8726[1] { ResolutionCandidate@8727 }
+    <name not found> = ArrayList@8728[1] { ResolutionCandidate@8727 }
+}
+
+ResolutionTaskHolder@8729 {
+    <name not found> = ArrayList@8730[1] { ResolutionCandidate@8731 }
+    <name not found> = ArrayList@8732[1] { ResolutionCandidate@8731 }
+}
+
+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@8741 {
+    <name not found> = ArrayList@8742[1] { ResolutionCandidate@8743 }
+    <name not found> = ArrayList@8744[1] { ResolutionCandidate@8743 }
+}
+
+ResolutionTaskHolder@8745 {
+    <name not found> = ArrayList@8746[1] { ResolutionCandidate@8747 }
+    <name not found> = ArrayList@8748[1] { ResolutionCandidate@8747 }
+}
+
+ResolutionTaskHolder@8749 {
+    <name not found> = ArrayList@8750[1] { ResolutionCandidate@8751 }
+    <name not found> = ArrayList@8752[1] { ResolutionCandidate@8751 }
+}
+
+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@8761 {
+    <name not found> = ArrayList@8762[1] { ResolutionCandidate@8763 }
+    <name not found> = ArrayList@8764[1] { ResolutionCandidate@8763 }
+}
+
+ResolutionTaskHolder@8765 {
+    <name not found> = ArrayList@8766[1] { ResolutionCandidate@8767 }
+    <name not found> = ArrayList@8768[1] { ResolutionCandidate@8767 }
+}
+
+ResolutionTaskHolder@8769 {
+    <name not found> = ArrayList@8770[1] { ResolutionCandidate@8771 }
+    <name not found> = ArrayList@8772[1] { ResolutionCandidate@8771 }
+}
+
+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@8781 {
+    <name not found> = ArrayList@8782[1] { ResolutionCandidate@8783 }
+    <name not found> = ArrayList@8784[1] { ResolutionCandidate@8783 }
+}
+
+ResolutionTaskHolder@8785 {
+    <name not found> = ArrayList@8786[1] { ResolutionCandidate@8787 }
+    <name not found> = ArrayList@8788[1] { ResolutionCandidate@8787 }
+}
+
+ResolutionTaskHolder@8789 {
+    <name not found> = ArrayList@8790[1] { ResolutionCandidate@8791 }
+    <name not found> = ArrayList@8792[1] { ResolutionCandidate@8791 }
+}
+
+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@8801 {
+    <name not found> = ArrayList@8802[1] { ResolutionCandidate@8803 }
+    <name not found> = ArrayList@8804[1] { ResolutionCandidate@8803 }
+}
+
+ResolutionTaskHolder@8805 {
+    <name not found> = ArrayList@8806[1] { ResolutionCandidate@8807 }
+    <name not found> = ArrayList@8808[1] { ResolutionCandidate@8807 }
+}
+
+ResolutionTaskHolder@8809 {
+    <name not found> = ArrayList@8810[1] { ResolutionCandidate@8811 }
+    <name not found> = ArrayList@8812[1] { ResolutionCandidate@8811 }
+}
+
+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@8821 {
+    <name not found> = ArrayList@8822[1] { ResolutionCandidate@8823 }
+    <name not found> = ArrayList@8824[1] { ResolutionCandidate@8823 }
+}
+
+ResolutionTaskHolder@8825 {
+    <name not found> = ArrayList@8826[1] { ResolutionCandidate@8827 }
+    <name not found> = ArrayList@8828[1] { ResolutionCandidate@8827 }
+}
+
+ResolutionTaskHolder@8829 {
+    <name not found> = ArrayList@8830[1] { ResolutionCandidate@8831 }
+    <name not found> = ArrayList@8832[1] { ResolutionCandidate@8831 }
+}
+
+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@8841 {
+    <name not found> = ArrayList@8842[1] { ResolutionCandidate@8843 }
+    <name not found> = ArrayList@8844[1] { ResolutionCandidate@8843 }
+}
+
+ResolutionTaskHolder@8845 {
+    <name not found> = ArrayList@8846[1] { ResolutionCandidate@8847 }
+    <name not found> = ArrayList@8848[1] { ResolutionCandidate@8847 }
+}
+
+ResolutionTaskHolder@8849 {
+    <name not found> = ArrayList@8850[1] { ResolutionCandidate@8851 }
+    <name not found> = ArrayList@8852[1] { ResolutionCandidate@8851 }
+}
+
+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@8861 {
+    <name not found> = ArrayList@8862[1] { ResolutionCandidate@8863 }
+    <name not found> = ArrayList@8864[1] { ResolutionCandidate@8863 }
+}
+
+ResolutionTaskHolder@8865 {
+    <name not found> = ArrayList@8866[1] { ResolutionCandidate@8867 }
+    <name not found> = ArrayList@8868[1] { ResolutionCandidate@8867 }
+}
+
+ResolutionTaskHolder@8869 {
+    <name not found> = ArrayList@8870[1] { ResolutionCandidate@8871 }
+    <name not found> = ArrayList@8872[1] { ResolutionCandidate@8871 }
+}
+
+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@8881 {
+    <name not found> = ArrayList@8882[1] { ResolutionCandidate@8883 }
+    <name not found> = ArrayList@8884[1] { ResolutionCandidate@8883 }
+}
+
+ResolutionTaskHolder@8885 {
+    <name not found> = ArrayList@8886[1] { ResolutionCandidate@8887 }
+    <name not found> = ArrayList@8888[1] { ResolutionCandidate@8887 }
+}
+
+ResolutionTaskHolder@8889 {
+    <name not found> = ArrayList@8890[1] { ResolutionCandidate@8891 }
+    <name not found> = ArrayList@8892[1] { ResolutionCandidate@8891 }
+}
+
+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@8901 {
+    <name not found> = ArrayList@8902[1] { ResolutionCandidate@8903 }
+    <name not found> = ArrayList@8904[1] { ResolutionCandidate@8903 }
+}
+
+ResolutionTaskHolder@8905 {
+    <name not found> = ArrayList@8906[1] { ResolutionCandidate@8907 }
+    <name not found> = ArrayList@8908[1] { ResolutionCandidate@8907 }
+}
+
+ResolutionTaskHolder@8909 {
+    <name not found> = ArrayList@8910[1] { ResolutionCandidate@8911 }
+    <name not found> = ArrayList@8912[1] { ResolutionCandidate@8911 }
+}
+
+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@8921 {
+    <name not found> = ArrayList@8922[1] { ResolutionCandidate@8923 }
+    <name not found> = ArrayList@8924[1] { ResolutionCandidate@8923 }
+}
+
+ResolutionTaskHolder@8925 {
+    <name not found> = ArrayList@8926[1] { ResolutionCandidate@8927 }
+    <name not found> = ArrayList@8928[1] { ResolutionCandidate@8927 }
+}
+
+ResolutionTaskHolder@8929 {
+    <name not found> = ArrayList@8930[1] { ResolutionCandidate@8931 }
+    <name not found> = ArrayList@8932[1] { ResolutionCandidate@8931 }
+}
+
+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@8941 {
+    <name not found> = ArrayList@8942[1] { ResolutionCandidate@8943 }
+    <name not found> = ArrayList@8944[1] { ResolutionCandidate@8943 }
+}
+
+ResolutionTaskHolder@8945 {
+    <name not found> = ArrayList@8946[1] { ResolutionCandidate@8947 }
+    <name not found> = ArrayList@8948[1] { ResolutionCandidate@8947 }
+}
+
+ResolutionTaskHolder@8949 {
+    <name not found> = ArrayList@8950[1] { ResolutionCandidate@8951 }
+    <name not found> = ArrayList@8952[1] { ResolutionCandidate@8951 }
+}
+
+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@8961 {
+    <name not found> = ArrayList@8962[1] { ResolutionCandidate@8963 }
+    <name not found> = ArrayList@8964[1] { ResolutionCandidate@8963 }
+}
+
+ResolutionTaskHolder@8965 {
+    <name not found> = ArrayList@8966[1] { ResolutionCandidate@8967 }
+    <name not found> = ArrayList@8968[1] { ResolutionCandidate@8967 }
+}
+
+ResolutionTaskHolder@8969 {
+    <name not found> = ArrayList@8970[1] { ResolutionCandidate@8971 }
+    <name not found> = ArrayList@8972[1] { ResolutionCandidate@8971 }
+}
+
+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@8981 {
+    <name not found> = ArrayList@8982[1] { ResolutionCandidate@8983 }
+    <name not found> = ArrayList@8984[1] { ResolutionCandidate@8983 }
+}
+
+ResolutionTaskHolder@8985 {
+    <name not found> = ArrayList@8986[1] { ResolutionCandidate@8987 }
+    <name not found> = ArrayList@8988[1] { ResolutionCandidate@8987 }
+}
+
+ResolutionTaskHolder@8989 {
+    <name not found> = ArrayList@8990[1] { ResolutionCandidate@8991 }
+    <name not found> = ArrayList@8992[1] { ResolutionCandidate@8991 }
+}
+
+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@9001 {
+    <name not found> = ArrayList@9002[1] { ResolutionCandidate@9003 }
+    <name not found> = ArrayList@9004[1] { ResolutionCandidate@9003 }
+}
+
+ResolutionTaskHolder@9005 {
+    <name not found> = ArrayList@9006[1] { ResolutionCandidate@9007 }
+    <name not found> = ArrayList@9008[1] { ResolutionCandidate@9007 }
+}
+
+ResolutionTaskHolder@9009 {
+    <name not found> = ArrayList@9010[1] { ResolutionCandidate@9011 }
+    <name not found> = ArrayList@9012[1] { ResolutionCandidate@9011 }
+}
+
+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@9021 {
+    <name not found> = ArrayList@9022[1] { ResolutionCandidate@9023 }
+    <name not found> = ArrayList@9024[1] { ResolutionCandidate@9023 }
+}
+
+ResolutionTaskHolder@9025 {
+    <name not found> = ArrayList@9026[1] { ResolutionCandidate@9027 }
+    <name not found> = ArrayList@9028[1] { ResolutionCandidate@9027 }
+}
+
+ResolutionTaskHolder@9029 {
+    <name not found> = ArrayList@9030[1] { ResolutionCandidate@9031 }
+    <name not found> = ArrayList@9032[1] { ResolutionCandidate@9031 }
+}
+
+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@9041 {
+    <name not found> = ArrayList@9042[1] { ResolutionCandidate@9043 }
+    <name not found> = ArrayList@9044[1] { ResolutionCandidate@9043 }
+}
+
+ResolutionTaskHolder@9045 {
+    <name not found> = ArrayList@9046[1] { ResolutionCandidate@9047 }
+    <name not found> = ArrayList@9048[1] { ResolutionCandidate@9047 }
+}
+
+ResolutionTaskHolder@9049 {
+    <name not found> = ArrayList@9050[1] { ResolutionCandidate@9051 }
+    <name not found> = ArrayList@9052[1] { ResolutionCandidate@9051 }
+}
+
+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@9061 {
+    <name not found> = ArrayList@9062[1] { ResolutionCandidate@9063 }
+    <name not found> = ArrayList@9064[1] { ResolutionCandidate@9063 }
+}
+
+ResolutionTaskHolder@9065 {
+    <name not found> = ArrayList@9066[1] { ResolutionCandidate@9067 }
+    <name not found> = ArrayList@9068[1] { ResolutionCandidate@9067 }
+}
+
+ResolutionTaskHolder@9069 {
+    <name not found> = ArrayList@9070[1] { ResolutionCandidate@9071 }
+    <name not found> = ArrayList@9072[1] { ResolutionCandidate@9071 }
+}
+
+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@9081 {
+    <name not found> = ArrayList@9082[1] { ResolutionCandidate@9083 }
+    <name not found> = ArrayList@9084[1] { ResolutionCandidate@9083 }
+}
+
+ResolutionTaskHolder@9085 {
+    <name not found> = ArrayList@9086[1] { ResolutionCandidate@9087 }
+    <name not found> = ArrayList@9088[1] { ResolutionCandidate@9087 }
+}
+
+ResolutionTaskHolder@9089 {
+    <name not found> = ArrayList@9090[1] { ResolutionCandidate@9091 }
+    <name not found> = ArrayList@9092[1] { ResolutionCandidate@9091 }
+}
+
+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@9101 {
+    <name not found> = ArrayList@9102[1] { ResolutionCandidate@9103 }
+    <name not found> = ArrayList@9104[1] { ResolutionCandidate@9103 }
+}
+
+ResolutionTaskHolder@9105 {
+    <name not found> = ArrayList@9106[1] { ResolutionCandidate@9107 }
+    <name not found> = ArrayList@9108[1] { ResolutionCandidate@9107 }
+}
+
+ResolutionTaskHolder@9109 {
+    <name not found> = ArrayList@9110[1] { ResolutionCandidate@9111 }
+    <name not found> = ArrayList@9112[1] { ResolutionCandidate@9111 }
+}
+
+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@9121 {
+    <name not found> = ArrayList@9122[1] { ResolutionCandidate@9123 }
+    <name not found> = ArrayList@9124[1] { ResolutionCandidate@9123 }
+}
+
+ResolutionTaskHolder@9125 {
+    <name not found> = ArrayList@9126[1] { ResolutionCandidate@9127 }
+    <name not found> = ArrayList@9128[1] { ResolutionCandidate@9127 }
+}
+
+ResolutionTaskHolder@9129 {
+    <name not found> = ArrayList@9130[1] { ResolutionCandidate@9131 }
+    <name not found> = ArrayList@9132[1] { ResolutionCandidate@9131 }
+}
+
+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@9141 {
+    <name not found> = ArrayList@9142[1] { ResolutionCandidate@9143 }
+    <name not found> = ArrayList@9144[1] { ResolutionCandidate@9143 }
+}
+
+ResolutionTaskHolder@9145 {
+    <name not found> = ArrayList@9146[1] { ResolutionCandidate@9147 }
+    <name not found> = ArrayList@9148[1] { ResolutionCandidate@9147 }
+}
+
+ResolutionTaskHolder@9149 {
+    <name not found> = ArrayList@9150[1] { ResolutionCandidate@9151 }
+    <name not found> = ArrayList@9152[1] { ResolutionCandidate@9151 }
+}
+
+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@9161 {
+    <name not found> = ArrayList@9162[1] { ResolutionCandidate@9163 }
+    <name not found> = ArrayList@9164[1] { ResolutionCandidate@9163 }
+}
+
+ResolutionTaskHolder@9165 {
+    <name not found> = ArrayList@9166[1] { ResolutionCandidate@9167 }
+    <name not found> = ArrayList@9168[1] { ResolutionCandidate@9167 }
+}
+
+ResolutionTaskHolder@9169 {
+    <name not found> = ArrayList@9170[1] { ResolutionCandidate@9171 }
+    <name not found> = ArrayList@9172[1] { ResolutionCandidate@9171 }
+}
+
+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@9181 {
+    <name not found> = ArrayList@9182[1] { ResolutionCandidate@9183 }
+    <name not found> = ArrayList@9184[1] { ResolutionCandidate@9183 }
+}
+
+ResolutionTaskHolder@9185 {
+    <name not found> = ArrayList@9186[1] { ResolutionCandidate@9187 }
+    <name not found> = ArrayList@9188[1] { ResolutionCandidate@9187 }
+}
+
+ResolutionTaskHolder@9189 {
+    <name not found> = ArrayList@9190[1] { ResolutionCandidate@9191 }
+    <name not found> = ArrayList@9192[1] { ResolutionCandidate@9191 }
+}
+
+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@9201 {
+    <name not found> = ArrayList@9202[1] { ResolutionCandidate@9203 }
+    <name not found> = ArrayList@9204[1] { ResolutionCandidate@9203 }
+}
+
+ResolutionTaskHolder@9205 {
+    <name not found> = ArrayList@9206[1] { ResolutionCandidate@9207 }
+    <name not found> = ArrayList@9208[1] { ResolutionCandidate@9207 }
+}
+
+ResolutionTaskHolder@9209 {
+    <name not found> = ArrayList@9210[1] { ResolutionCandidate@9211 }
+    <name not found> = ArrayList@9212[1] { ResolutionCandidate@9211 }
+}
+
+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@9221 {
+    <name not found> = ArrayList@9222[1] { ResolutionCandidate@9223 }
+    <name not found> = ArrayList@9224[1] { ResolutionCandidate@9223 }
+}
+
+ResolutionTaskHolder@9225 {
+    <name not found> = ArrayList@9226[1] { ResolutionCandidate@9227 }
+    <name not found> = ArrayList@9228[1] { ResolutionCandidate@9227 }
+}
+
+ResolutionTaskHolder@9229 {
+    <name not found> = ArrayList@9230[1] { ResolutionCandidate@9231 }
+    <name not found> = ArrayList@9232[1] { ResolutionCandidate@9231 }
+}
+
+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@9241 {
+    <name not found> = ArrayList@9242[1] { ResolutionCandidate@9243 }
+    <name not found> = ArrayList@9244[1] { ResolutionCandidate@9243 }
+}
+
+ResolutionTaskHolder@9245 {
+    <name not found> = ArrayList@9246[1] { ResolutionCandidate@9247 }
+    <name not found> = ArrayList@9248[1] { ResolutionCandidate@9247 }
+}
+
+ResolutionTaskHolder@9249 {
+    <name not found> = ArrayList@9250[1] { ResolutionCandidate@9251 }
+    <name not found> = ArrayList@9252[1] { ResolutionCandidate@9251 }
+}
+
+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@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']
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
index a3201e0702a..f23e909db47 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/kotlinSignature/constructorNamedArguments.lazy.log
@@ -93,3 +93,12 @@ LazyJavaPackageFragment@22['lang'] {
     functions('A': Name@31) = EmptyList@34[empty] // through LazyPackageFragmentScopeForJavaPackage@54
     memberIndex = computeMemberIndex$1@55 // through LazyPackageFragmentScopeForJavaPackage@54
 }
+
+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]
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
index d17aa7d7bfb..56bc0bf8d7e 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/arrayOfNullsReified.lazy.log
@@ -123,3 +123,44 @@ LazyJavaPackageFragment@19['lang'] {
     functions('bar': Name@45) = EmptyList@48[empty] // through LazyPackageFragmentScopeForJavaPackage@68
     memberIndex = computeMemberIndex$1@69 // through LazyPackageFragmentScopeForJavaPackage@68
 }
+
+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]
+    <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 }
+    <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@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 }
+}
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
index 54a057c932f..7350f208c55 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/nonCallableReiefied.lazy.log
@@ -41,105 +41,129 @@ LazyJavaPackageFragment@3['<root>'] {
     classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@41
     classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('get': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('set': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('toString': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@41
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('get': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('set': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    functions('toString': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@41
-    memberIndex = computeMemberIndex$1@50 // through LazyPackageFragmentScopeForJavaPackage@41
+    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@41
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@41
 }
 
 LazyJavaPackageFragment@27['io'] {
-    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('get': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('set': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('toString': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@51
-    deserializedPackageScope = DeserializedPackageMemberScope@52 // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('get': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    functions('get': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('set': Name@45) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    functions('set': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    functions('toString': Name@46) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    functions('toString': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@51
-    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
-    membersProtos = LinkedHashMap@54 // through DeserializedPackageMemberScope@52
-    properties('a': Name@55) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    properties('get': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    properties('length': Name@56) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    properties('set': Name@45) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    properties('toString': Name@46) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
-    properties('x': Name@47) = EmptyList@49[empty] // through DeserializedPackageMemberScope@52
+    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@46
+    deserializedPackageScope = DeserializedPackageMemberScope@47 // through LazyPackageFragmentScopeForJavaPackage@46
+    membersProtos = LinkedHashMap@48 // through DeserializedPackageMemberScope@47
+    properties('x': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@47
 }
 
 LazyJavaPackageFragment@11['java'] {
-    classes('lang': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@58
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@58
-    functions('lang': Name@59) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@58
-    memberIndex = computeMemberIndex$1@60 // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('lang': Name@52) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@53 // through LazyPackageFragmentScopeForJavaPackage@51
 }
 
 LazyJavaPackageFragment@34['jvm'] {
-    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('get': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('set': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('toString': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@61
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('get': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('set': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    functions('toString': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@61
-    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@61
+    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@54
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@54
 }
 
 LazyJavaPackageFragment@20['kotlin'] {
-    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('get': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('io': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('jvm': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('set': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('toString': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = DeserializedPackageMemberScope@66 // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('get': Name@44) = ArrayList@67[2] { DeserializedSimpleFunctionDescriptor@68['get'], DeserializedSimpleFunctionDescriptor@69['get'] } // through DeserializedPackageMemberScope@66
-    functions('get': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('io': Name@70) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    functions('io': Name@70) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('jvm': Name@71) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    functions('jvm': Name@71) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('set': Name@45) = ArrayList@72[1] { DeserializedSimpleFunctionDescriptor@73['set'] } // through DeserializedPackageMemberScope@66
-    functions('set': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    functions('toString': Name@46) = ArrayList@74[3] { DeserializedSimpleFunctionDescriptor@75['toString'], DeserializedSimpleFunctionDescriptor@76['toString'], DeserializedSimpleFunctionDescriptor@77['toString'] } // through DeserializedPackageMemberScope@66
-    functions('toString': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    memberIndex = computeMemberIndex$1@78 // through LazyPackageFragmentScopeForJavaPackage@63
-    membersProtos = LinkedHashMap@79 // through DeserializedPackageMemberScope@66
-    properties('a': Name@55) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    properties('get': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    properties('io': Name@70) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    properties('jvm': Name@71) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    properties('length': Name@56) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    properties('set': Name@45) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    properties('toString': Name@46) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
-    properties('x': Name@47) = EmptyList@49[empty] // through DeserializedPackageMemberScope@66
+    classes('Array': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('Int': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('String': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('io': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('jvm': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = DeserializedPackageMemberScope@58 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('io': Name@59) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
+    functions('io': Name@59) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('jvm': Name@60) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
+    functions('jvm': Name@60) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@55
+    membersProtos = LinkedHashMap@62 // through DeserializedPackageMemberScope@58
+    properties('io': Name@59) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
+    properties('jvm': Name@60) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
+    properties('x': Name@44) = EmptyList@49[empty] // through DeserializedPackageMemberScope@58
 }
 
 LazyJavaPackageFragment@13['lang'] {
-    classes('get': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('set': Name@45) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('toString': Name@46) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('x': Name@47) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@48 // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('get': Name@44) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('set': Name@45) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    functions('toString': Name@46) = EmptyList@49[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    memberIndex = computeMemberIndex$1@81 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('x': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@63
+}
+
+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]
+    <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@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 }
+}
+
+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> = 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 }
 }
diff --git a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
index 9b6b890ea3b..17cfe04f057 100644
--- a/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
+++ b/compiler/testData/diagnostics/testsWithStdLib/reified/reifiedNothingSubstitution.lazy.log
@@ -31,11 +31,11 @@ DeserializedTypeParameterDescriptor@20['T'] {
 }
 
 DeserializedType@24['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@17
+    constructor = AbstractLazyTypeParameterDescriptor$1@21
 }
 
 DeserializedType@25['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@17
+    constructor = AbstractLazyTypeParameterDescriptor$1@21
 }
 
 DeserializedType@26['T in kotlin'] {
@@ -130,168 +130,247 @@ LazyJavaPackageFragment@47['<root>'] {
     classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@85
     classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('javaClass': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    classes('toString': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@85
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('Array': Name@86) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('array': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('block': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('invoke': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('javaClass': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    functions('toString': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@85
-    memberIndex = computeMemberIndex$1@98 // through LazyPackageFragmentScopeForJavaPackage@85
+    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@85
+    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@85
+    memberIndex = computeMemberIndex$1@96 // through LazyPackageFragmentScopeForJavaPackage@85
 }
 
 LazyJavaPackageFragment@10['internal'] {
-    classes('Intrinsic': Name@99) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@100
+    classes('Intrinsic': Name@97) = DeserializedClassDescriptor@2['Intrinsic'] // through LazyPackageFragmentScopeForJavaPackage@98
 }
 
 LazyJavaPackageFragment@69['io'] {
-    classes('Any': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('javaClass': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    classes('toString': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@101
-    deserializedPackageScope = DeserializedPackageMemberScope@102 // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('Array': Name@86) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    functions('Array': Name@86) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('array': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    functions('array': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('block': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    functions('block': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('invoke': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    functions('invoke': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('javaClass': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    functions('javaClass': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    functions('toString': Name@95) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    functions('toString': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@101
-    memberIndex = computeMemberIndex$1@103 // through LazyPackageFragmentScopeForJavaPackage@101
-    membersProtos = LinkedHashMap@104 // through DeserializedPackageMemberScope@102
-    properties('Array': Name@86) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    properties('array': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    properties('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    properties('javaClass': Name@94) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
-    properties('toString': Name@95) = EmptyList@97[empty] // through DeserializedPackageMemberScope@102
+    classes('Any': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = DeserializedPackageMemberScope@100 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('array': Name@89) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('block': Name@90) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('javaClass': Name@93) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@99
+    memberIndex = computeMemberIndex$1@101 // through LazyPackageFragmentScopeForJavaPackage@99
+    membersProtos = LinkedHashMap@102 // through DeserializedPackageMemberScope@100
+    properties('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    properties('array': Name@89) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    properties('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
+    properties('javaClass': Name@93) = EmptyList@95[empty] // through DeserializedPackageMemberScope@100
 }
 
 LazyJavaPackageFragment@54['java'] {
-    classes('lang': Name@105) = null // through LazyPackageFragmentScopeForJavaPackage@106
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@106
-    functions('lang': Name@107) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@106
-    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@106
+    classes('lang': Name@103) = null // through LazyPackageFragmentScopeForJavaPackage@104
+    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@104
+    functions('lang': Name@105) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@104
+    memberIndex = computeMemberIndex$1@106 // through LazyPackageFragmentScopeForJavaPackage@104
 }
 
 LazyJavaPackageFragment@76['jvm'] {
-    classes('Any': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('javaClass': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    classes('toString': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@109
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('Array': Name@86) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('array': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('block': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('invoke': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('javaClass': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    functions('toString': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@109
-    memberIndex = computeMemberIndex$1@110 // through LazyPackageFragmentScopeForJavaPackage@109
+    classes('Any': Name@84) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('inline': Name@92) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@107
+    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@107
+    memberIndex = computeMemberIndex$1@108 // through LazyPackageFragmentScopeForJavaPackage@107
 }
 
 LazyJavaPackageFragment@13['kotlin'] {
-    classes('Any': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Array': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('inline': Name@92) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('io': Name@114) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('javaClass': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('jvm': Name@115) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    classes('toString': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@112
-    deserializedPackageScope = DeserializedPackageMemberScope@116 // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('Array': Name@86) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    functions('Array': Name@86) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('array': Name@89) = ArrayList@117[1] { DeserializedSimpleFunctionDescriptor@118['array'] } // through DeserializedPackageMemberScope@116
-    functions('array': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('block': Name@90) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    functions('block': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('invoke': Name@93) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    functions('invoke': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('io': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    functions('io': Name@119) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('javaClass': Name@94) = ArrayList@120[1] { DeserializedSimpleFunctionDescriptor@121['javaClass'] } // through DeserializedPackageMemberScope@116
-    functions('javaClass': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('jvm': Name@122) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    functions('jvm': Name@122) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    functions('toString': Name@95) = ArrayList@123[3] { DeserializedSimpleFunctionDescriptor@124['toString'], DeserializedSimpleFunctionDescriptor@125['toString'], DeserializedSimpleFunctionDescriptor@126['toString'] } // through DeserializedPackageMemberScope@116
-    functions('toString': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@112
-    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@112
-    membersProtos = LinkedHashMap@128 // through DeserializedPackageMemberScope@116
-    properties('Array': Name@86) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    properties('array': Name@89) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    properties('foo': Name@91) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    properties('io': Name@119) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    properties('javaClass': Name@94) = ArrayList@129[1] { DeserializedPropertyDescriptor@130['javaClass'] } // through DeserializedPackageMemberScope@116
-    properties('jvm': Name@122) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
-    properties('toString': Name@95) = EmptyList@97[empty] // through DeserializedPackageMemberScope@116
+    classes('Any': Name@109) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Array': Name@111) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('Nothing': Name@87) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('String': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('inline': Name@92) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('io': Name@112) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    classes('jvm': Name@113) = null // through LazyPackageFragmentScopeForJavaPackage@110
+    deserializedPackageScope = DeserializedPackageMemberScope@114 // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('array': Name@89) = ArrayList@115[1] { DeserializedSimpleFunctionDescriptor@116['array'] } // through DeserializedPackageMemberScope@114
+    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('block': Name@90) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('io': Name@117) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    functions('io': Name@117) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('javaClass': Name@93) = ArrayList@118[1] { DeserializedSimpleFunctionDescriptor@119['javaClass'] } // through DeserializedPackageMemberScope@114
+    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    functions('jvm': Name@120) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    functions('jvm': Name@120) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@110
+    memberIndex = computeMemberIndex$1@121 // through LazyPackageFragmentScopeForJavaPackage@110
+    membersProtos = LinkedHashMap@122 // through DeserializedPackageMemberScope@114
+    properties('Array': Name@86) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    properties('array': Name@89) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    properties('foo': Name@91) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    properties('io': Name@117) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
+    properties('javaClass': Name@93) = ArrayList@123[1] { DeserializedPropertyDescriptor@124['javaClass'] } // through DeserializedPackageMemberScope@114
+    properties('jvm': Name@120) = EmptyList@95[empty] // through DeserializedPackageMemberScope@114
 }
 
 LazyJavaPackageFragment@56['lang'] {
-    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('Class': Name@132) = LazyJavaClassDescriptor@42['Class'] // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('invoke': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('javaClass': Name@94) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    classes('toString': Name@95) = null // through LazyPackageFragmentScopeForJavaPackage@131
-    deserializedPackageScope = Empty@96 // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('Array': Name@86) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('array': Name@89) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('block': Name@90) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('foo': Name@91) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('invoke': Name@93) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('javaClass': Name@94) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    functions('toString': Name@95) = EmptyList@97[empty] // through LazyPackageFragmentScopeForJavaPackage@131
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@131
+    classes('Array': Name@86) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('Class': Name@126) = LazyJavaClassDescriptor@42['Class'] // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('array': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('block': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('foo': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    classes('javaClass': Name@93) = null // through LazyPackageFragmentScopeForJavaPackage@125
+    deserializedPackageScope = Empty@94 // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('Array': Name@86) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('array': Name@89) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('block': Name@90) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('foo': Name@91) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    functions('javaClass': Name@93) = EmptyList@95[empty] // through LazyPackageFragmentScopeForJavaPackage@125
+    memberIndex = computeMemberIndex$1@127 // through LazyPackageFragmentScopeForJavaPackage@125
 }
 
 LazyJavaTypeParameterDescriptor@44['T'] {
-    typeConstructor = AbstractLazyTypeParameterDescriptor$1@134
+    typeConstructor = AbstractLazyTypeParameterDescriptor$1@128
 }
 
-LazyJavaTypeParameterResolver@135 {
-    resolve(JavaTypeParameterImpl@136['T']) = LazyJavaTypeParameterDescriptor@44['T']
+LazyJavaTypeParameterResolver@129 {
+    resolve(JavaTypeParameterImpl@130['T']) = LazyJavaTypeParameterDescriptor@44['T']
 }
 
-TypeDeserializer@137 {
-    classDescriptors('2': Integer@138) = DeserializedClassDescriptor@139['Any']
-    classDescriptors('3': Integer@140) = DeserializedClassDescriptor@141['Array']
+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]
 }
 
-TypeDeserializer@142 {
-    classDescriptors('2': Integer@138) = DeserializedClassDescriptor@139['Any']
-    classDescriptors('54': Integer@143) = LazyJavaClassDescriptor@42['Class']
+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@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 }
+    <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]
+    <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]
+    <name not found> = EmptyList@95[empty]
+    <name not found> = EmptyList@95[empty]
+    <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@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> = 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 }
+}
+
+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']
 }