Update lazy logs after field rename

2014-11-11 17:45:30 +03:00
parent eb96b97bc8
commit 4f0d83a7fe
1653 changed files with 102316 additions and 102316 deletions
@@ -30,7 +30,7 @@ DeserializedTypeParameterDescriptor@17['T'] {
 }

 DeserializedType@21['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@18
+    constructor = AbstractLazyTypeParameterDescriptor$1@14
 }

 DeserializedType@22['T in kotlin'] {
@@ -38,7 +38,7 @@ DeserializedType@22['T in kotlin'] {
 }

 DeserializedType@23['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@14
+    constructor = AbstractLazyTypeParameterDescriptor$1@18
 }

 DeserializedType@24['java.lang.Class'] {
@@ -62,151 +62,151 @@ DeserializedType@20['kotlin.Any'] {
 }

 LazyAnnotationDescriptor@31 {
-    _resolutionResults = OverloadResolutionResultsImpl@32
-    _type = JetTypeImpl@33['AnnClass']
-    _valueArguments(ValueParameterDescriptorImpl@34['a']) = JavaClassValue@35
+    resolutionResults = OverloadResolutionResultsImpl@32
+    type = JetTypeImpl@33['AnnClass']
+    valueArguments(ValueParameterDescriptorImpl@34['a']) = JavaClassValue@35
 }

 LazyJavaClassDescriptor@36['AnnotatedElement'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@39
-    _typeConstructor = LazyJavaClassTypeConstructor@40['AnnotatedElement']
-    memberIndex = computeMemberIndex$1@41 // through LazyJavaClassMemberScope@39
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@39
+    memberIndex = computeMemberIndex$1@40 // through LazyJavaClassMemberScope@39
+    typeConstructor = LazyJavaClassTypeConstructor@41['AnnotatedElement']
 }

 LazyJavaClassDescriptor@42['Class'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@43
-    _typeConstructor = LazyJavaClassTypeConstructor@25['Class']
-    enumEntryIndex = LinkedHashMap@44 // through LazyJavaClassMemberScope@43
-    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@43
-    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@43
-    nestedClasses('invoke': Name@37) = null // through LazyJavaClassMemberScope@43
+    enumEntryIndex = LinkedHashMap@43 // through LazyJavaClassMemberScope@44
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@44
+    memberIndex = computeMemberIndex$1@45 // through LazyJavaClassMemberScope@44
+    nestedClassIndex = LinkedHashMap@46 // through LazyJavaClassMemberScope@44
+    nestedClasses('invoke': Name@37) = null // through LazyJavaClassMemberScope@44
+    typeConstructor = LazyJavaClassTypeConstructor@25['Class']
 }

 LazyJavaClassDescriptor@47['GenericDeclaration'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@48
-    _typeConstructor = LazyJavaClassTypeConstructor@49['GenericDeclaration']
-    memberIndex = computeMemberIndex$1@50 // through LazyJavaClassMemberScope@48
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@48
+    memberIndex = computeMemberIndex$1@49 // through LazyJavaClassMemberScope@48
+    typeConstructor = LazyJavaClassTypeConstructor@50['GenericDeclaration']
 }

 LazyJavaClassDescriptor@51['Serializable'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@52
-    _typeConstructor = LazyJavaClassTypeConstructor@53['Serializable']
-    memberIndex = computeMemberIndex$1@54 // through LazyJavaClassMemberScope@52
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@52
+    memberIndex = computeMemberIndex$1@53 // through LazyJavaClassMemberScope@52
+    typeConstructor = LazyJavaClassTypeConstructor@54['Serializable']
 }

 LazyJavaClassDescriptor@55['Type'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@56
-    _typeConstructor = LazyJavaClassTypeConstructor@57['Type']
-    memberIndex = computeMemberIndex$1@58 // through LazyJavaClassMemberScope@56
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyJavaClassMemberScope@56
+    memberIndex = computeMemberIndex$1@57 // through LazyJavaClassMemberScope@56
+    typeConstructor = LazyJavaClassTypeConstructor@58['Type']
 }

-LazyJavaClassTypeConstructor@40['AnnotatedElement'] {
-    _parameters = ArrayList@59[empty]
-    _supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@41['AnnotatedElement'] {
+    parameters = ArrayList@59[empty]
+    supertypes = ArrayList@60[1] { JetTypeImpl@61['Any'] }
 }

 LazyJavaClassTypeConstructor@25['Class'] {
-    _parameters = ArrayList@62[1] { LazyJavaTypeParameterDescriptor@63['T'] }
-    _supertypes = ArrayList@64[4] { LazyJavaClassifierType@65['Serializable'], LazyJavaClassifierType@66['GenericDeclaration'], LazyJavaClassifierType@67['Type'], ... }
+    parameters = ArrayList@62[1] { LazyJavaTypeParameterDescriptor@63['T'] }
+    supertypes = ArrayList@64[4] { LazyJavaClassifierType@65['Serializable'], LazyJavaClassifierType@66['GenericDeclaration'], LazyJavaClassifierType@67['Type'], ... }
 }

-LazyJavaClassTypeConstructor@49['GenericDeclaration'] {
-    _parameters = ArrayList@68[empty]
-    _supertypes = ArrayList@69[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@50['GenericDeclaration'] {
+    parameters = ArrayList@68[empty]
+    supertypes = ArrayList@69[1] { JetTypeImpl@61['Any'] }
 }

-LazyJavaClassTypeConstructor@53['Serializable'] {
-    _parameters = ArrayList@70[empty]
-    _supertypes = ArrayList@71[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@54['Serializable'] {
+    parameters = ArrayList@70[empty]
+    supertypes = ArrayList@71[1] { JetTypeImpl@61['Any'] }
 }

-LazyJavaClassTypeConstructor@57['Type'] {
-    _parameters = ArrayList@72[empty]
-    _supertypes = ArrayList@73[1] { JetTypeImpl@61['Any'] }
+LazyJavaClassTypeConstructor@58['Type'] {
+    parameters = ArrayList@72[empty]
+    supertypes = ArrayList@73[1] { JetTypeImpl@61['Any'] }
 }

 LazyJavaClassifierType@74['AnnotatedElement'] {
-    _arguments = ArrayList@75[empty]
-    _memberScope = LazyJavaClassMemberScope@39
-    _typeConstructor = LazyJavaClassTypeConstructor@40['AnnotatedElement']
+    arguments = ArrayList@75[empty]
    classifier = JavaClassImpl@76['AnnotatedElement']
+    memberScope = LazyJavaClassMemberScope@39
+    typeConstructor = LazyJavaClassTypeConstructor@41['AnnotatedElement']
 }

 LazyJavaClassifierType@66['GenericDeclaration'] {
-    _arguments = ArrayList@77[empty]
-    _memberScope = LazyJavaClassMemberScope@48
-    _typeConstructor = LazyJavaClassTypeConstructor@49['GenericDeclaration']
+    arguments = ArrayList@77[empty]
    classifier = JavaClassImpl@78['GenericDeclaration']
+    memberScope = LazyJavaClassMemberScope@48
+    typeConstructor = LazyJavaClassTypeConstructor@50['GenericDeclaration']
 }

 LazyJavaClassifierType@79['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@29
    classifier = JavaClassImpl@80['Object']
+    typeConstructor = DeserializedClassTypeConstructor@29
 }

 LazyJavaClassifierType@81['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@29
    classifier = JavaClassImpl@82['Object']
+    typeConstructor = DeserializedClassTypeConstructor@29
 }

 LazyJavaClassifierType@83['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@29
    classifier = JavaClassImpl@84['Object']
+    typeConstructor = DeserializedClassTypeConstructor@29
 }

 LazyJavaClassifierType@85['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@29
    classifier = JavaClassImpl@86['Object']
+    typeConstructor = DeserializedClassTypeConstructor@29
 }

 LazyJavaClassifierType@87['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@29
    classifier = JavaClassImpl@88['Object']
+    typeConstructor = DeserializedClassTypeConstructor@29
 }

 LazyJavaClassifierType@65['Serializable'] {
-    _arguments = ArrayList@89[empty]
-    _memberScope = LazyJavaClassMemberScope@52
-    _typeConstructor = LazyJavaClassTypeConstructor@53['Serializable']
+    arguments = ArrayList@89[empty]
    classifier = JavaClassImpl@90['Serializable']
+    memberScope = LazyJavaClassMemberScope@52
+    typeConstructor = LazyJavaClassTypeConstructor@54['Serializable']
 }

 LazyJavaClassifierType@67['Type'] {
-    _arguments = ArrayList@91[empty]
-    _memberScope = LazyJavaClassMemberScope@56
-    _typeConstructor = LazyJavaClassTypeConstructor@57['Type']
+    arguments = ArrayList@91[empty]
    classifier = JavaClassImpl@92['Type']
+    memberScope = LazyJavaClassMemberScope@56
+    typeConstructor = LazyJavaClassTypeConstructor@58['Type']
 }

 LazyJavaPackageFragmentProvider@93 {
-    _packageFragments('<root>': FqName@94) = LazyJavaPackageFragment@95['<root>']
-    _packageFragments('AnnClass': FqName@96) = null
-    _packageFragments('Class': FqName@97) = null
-    _packageFragments('MyClass': FqName@98) = null
-    _packageFragments('java': FqName@99) = LazyJavaPackageFragment@100['java']
-    _packageFragments('java.io': FqName@101) = LazyJavaPackageFragment@102['io']
-    _packageFragments('java.lang': FqName@103) = LazyJavaPackageFragment@104['lang']
-    _packageFragments('java.lang.AnnClass': FqName@105) = null
-    _packageFragments('java.lang.Class': FqName@106) = null
-    _packageFragments('java.lang.MyClass': FqName@107) = null
-    _packageFragments('java.lang.reflect': FqName@108) = LazyJavaPackageFragment@109['reflect']
-    _packageFragments('kotlin': FqName@110) = LazyJavaPackageFragment@11['kotlin']
-    _packageFragments('kotlin.AnnClass': FqName@111) = null
-    _packageFragments('kotlin.Class': FqName@112) = null
-    _packageFragments('kotlin.MyClass': FqName@113) = null
-    _packageFragments('kotlin.io': FqName@114) = LazyJavaPackageFragment@115['io']
-    _packageFragments('kotlin.io.AnnClass': FqName@116) = null
-    _packageFragments('kotlin.io.Class': FqName@117) = null
-    _packageFragments('kotlin.io.MyClass': FqName@118) = null
-    _packageFragments('kotlin.jvm': FqName@119) = LazyJavaPackageFragment@120['jvm']
-    _packageFragments('kotlin.jvm.AnnClass': FqName@121) = null
-    _packageFragments('kotlin.jvm.Class': FqName@122) = null
-    _packageFragments('kotlin.jvm.MyClass': FqName@123) = null
-    _packageFragments('kotlin.jvm.internal': FqName@124) = LazyJavaPackageFragment@8['internal']
-    _packageFragments('test': FqName@125) = null
-    _packageFragments('test.AnnClass': FqName@126) = null
-    _packageFragments('test.Class': FqName@127) = null
-    _packageFragments('test.MyClass': FqName@128) = null
+    packageFragments('<root>': FqName@94) = LazyJavaPackageFragment@95['<root>']
+    packageFragments('AnnClass': FqName@96) = null
+    packageFragments('Class': FqName@97) = null
+    packageFragments('MyClass': FqName@98) = null
+    packageFragments('java': FqName@99) = LazyJavaPackageFragment@100['java']
+    packageFragments('java.io': FqName@101) = LazyJavaPackageFragment@102['io']
+    packageFragments('java.lang': FqName@103) = LazyJavaPackageFragment@104['lang']
+    packageFragments('java.lang.AnnClass': FqName@105) = null
+    packageFragments('java.lang.Class': FqName@106) = null
+    packageFragments('java.lang.MyClass': FqName@107) = null
+    packageFragments('java.lang.reflect': FqName@108) = LazyJavaPackageFragment@109['reflect']
+    packageFragments('kotlin': FqName@110) = LazyJavaPackageFragment@11['kotlin']
+    packageFragments('kotlin.AnnClass': FqName@111) = null
+    packageFragments('kotlin.Class': FqName@112) = null
+    packageFragments('kotlin.MyClass': FqName@113) = null
+    packageFragments('kotlin.io': FqName@114) = LazyJavaPackageFragment@115['io']
+    packageFragments('kotlin.io.AnnClass': FqName@116) = null
+    packageFragments('kotlin.io.Class': FqName@117) = null
+    packageFragments('kotlin.io.MyClass': FqName@118) = null
+    packageFragments('kotlin.jvm': FqName@119) = LazyJavaPackageFragment@120['jvm']
+    packageFragments('kotlin.jvm.AnnClass': FqName@121) = null
+    packageFragments('kotlin.jvm.Class': FqName@122) = null
+    packageFragments('kotlin.jvm.MyClass': FqName@123) = null
+    packageFragments('kotlin.jvm.internal': FqName@124) = LazyJavaPackageFragment@8['internal']
+    packageFragments('test': FqName@125) = null
+    packageFragments('test.AnnClass': FqName@126) = null
+    packageFragments('test.Class': FqName@127) = null
+    packageFragments('test.MyClass': FqName@128) = null
    topLevelClasses(JavaClassImpl@76['AnnotatedElement']) = LazyJavaClassDescriptor@36['AnnotatedElement']
    topLevelClasses(JavaClassImpl@129['Class']) = LazyJavaClassDescriptor@42['Class']
    topLevelClasses(JavaClassImpl@78['GenericDeclaration']) = LazyJavaClassDescriptor@47['GenericDeclaration']
@@ -219,67 +219,67 @@ LazyJavaPackageFragment@8['internal'] {
 }

 LazyJavaPackageFragment@115['io'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    _functions('javaClass': Name@133) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('Class': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    classes('javaClass': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@132
-    deserializedPackageScope = DeserializedPackageMemberScope@135 // through LazyPackageFragmentScopeForJavaPackage@132
+    classes('Class': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@133
+    deserializedPackageScope = DeserializedPackageMemberScope@135 // through LazyPackageFragmentScopeForJavaPackage@133
    functions('invoke': Name@37) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
-    functions('javaClass': Name@133) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
-    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@132
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    functions('javaClass': Name@134) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
+    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@133
+    memberIndex = computeMemberIndex$1@136 // through LazyPackageFragmentScopeForJavaPackage@133
    membersProtos = HashMap@137 // through DeserializedPackageMemberScope@135
-    properties('javaClass': Name@133) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
+    properties('javaClass': Name@134) = EmptyList@38[empty] // through DeserializedPackageMemberScope@135
 }

 LazyJavaPackageFragment@100['java'] {
-    _functions('lang': Name@138) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('lang': Name@140) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    deserializedPackageScope = Empty@141 // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('lang': Name@138) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@139
+    functions('lang': Name@141) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@139
    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@139
 }

 LazyJavaPackageFragment@120['jvm'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    _functions('javaClass': Name@133) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('Class': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@143
+    classes('Class': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@143
    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    classes('javaClass': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@143
-    deserializedPackageScope = Empty@141 // through LazyPackageFragmentScopeForJavaPackage@143
+    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@143
+    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@143
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@143
+    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@143
    memberIndex = computeMemberIndex$1@144 // through LazyPackageFragmentScopeForJavaPackage@143
 }

 LazyJavaPackageFragment@11['kotlin'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('io': Name@146) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('javaClass': Name@133) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    _functions('jvm': Name@147) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('Any': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('Class': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('inline': Name@149) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('io': Name@150) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('javaClass': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    classes('jvm': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@145
-    deserializedPackageScope = DeserializedPackageMemberScope@152 // through LazyPackageFragmentScopeForJavaPackage@145
-    functions('invoke': Name@37) = EmptyList@38[empty] // through DeserializedPackageMemberScope@152
-    functions('io': Name@146) = EmptyList@38[empty] // through DeserializedPackageMemberScope@152
-    functions('javaClass': Name@133) = ArrayList@153[1] { DeserializedSimpleFunctionDescriptor@154['javaClass'] } // through DeserializedPackageMemberScope@152
-    functions('jvm': Name@147) = EmptyList@38[empty] // through DeserializedPackageMemberScope@152
-    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@145
-    membersProtos = HashMap@156 // through DeserializedPackageMemberScope@152
-    properties('io': Name@146) = EmptyList@38[empty] // through DeserializedPackageMemberScope@152
-    properties('javaClass': Name@133) = ArrayList@157[1] { DeserializedPropertyDescriptor@158['javaClass'] } // through DeserializedPackageMemberScope@152
-    properties('jvm': Name@147) = EmptyList@38[empty] // through DeserializedPackageMemberScope@152
+    classes('Any': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('Class': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('inline': Name@147) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('io': Name@148) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('jvm': Name@149) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    deserializedPackageScope = DeserializedPackageMemberScope@150 // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('invoke': Name@37) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('io': Name@151) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
+    functions('io': Name@151) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('javaClass': Name@134) = ArrayList@152[1] { DeserializedSimpleFunctionDescriptor@153['javaClass'] } // through DeserializedPackageMemberScope@150
+    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('jvm': Name@154) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
+    functions('jvm': Name@154) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@146
+    memberIndex = computeMemberIndex$1@155 // through LazyPackageFragmentScopeForJavaPackage@146
+    membersProtos = HashMap@156 // through DeserializedPackageMemberScope@150
+    properties('io': Name@151) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
+    properties('javaClass': Name@134) = ArrayList@157[1] { DeserializedPropertyDescriptor@158['javaClass'] } // through DeserializedPackageMemberScope@150
+    properties('jvm': Name@154) = EmptyList@38[empty] // through DeserializedPackageMemberScope@150
 }

 LazyJavaPackageFragment@104['lang'] {
-    _functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    _functions('javaClass': Name@133) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('Class': Name@134) = LazyJavaClassDescriptor@42['Class'] // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('Class': Name@132) = LazyJavaClassDescriptor@42['Class'] // through LazyPackageFragmentScopeForJavaPackage@159
    classes('invoke': Name@37) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    classes('javaClass': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@159
-    deserializedPackageScope = Empty@141 // through LazyPackageFragmentScopeForJavaPackage@159
+    classes('javaClass': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@159
+    deserializedPackageScope = Empty@140 // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('invoke': Name@37) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@159
+    functions('javaClass': Name@134) = EmptyList@38[empty] // through LazyPackageFragmentScopeForJavaPackage@159
    memberIndex = computeMemberIndex$1@160 // through LazyPackageFragmentScopeForJavaPackage@159
 }

@@ -12,98 +12,98 @@ DeserializedType@5['kotlin.String'] {
 }

 LazyAnnotationDescriptor@7 {
-    _resolutionResults = OverloadResolutionResultsImpl@8
-    _type = JetTypeImpl@9['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@11
+    resolutionResults = OverloadResolutionResultsImpl@8
+    type = JetTypeImpl@9['platformName']
+    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@11
 }

 LazyAnnotationDescriptor@12 {
-    _resolutionResults = OverloadResolutionResultsImpl@13
-    _type = JetTypeImpl@14['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@15
+    resolutionResults = OverloadResolutionResultsImpl@13
+    type = JetTypeImpl@14['platformName']
+    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@15
 }

 LazyAnnotationDescriptor@16 {
-    _resolutionResults = OverloadResolutionResultsImpl@17
-    _type = JetTypeImpl@18['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@19
+    resolutionResults = OverloadResolutionResultsImpl@17
+    type = JetTypeImpl@18['platformName']
+    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@19
 }

 LazyAnnotationDescriptor@20 {
-    _resolutionResults = OverloadResolutionResultsImpl@21
-    _type = JetTypeImpl@22['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@23
+    resolutionResults = OverloadResolutionResultsImpl@21
+    type = JetTypeImpl@22['platformName']
+    valueArguments(ValueParameterDescriptorImpl@10['name']) = StringValue@23
 }

 LazyJavaPackageFragmentProvider@24 {
-    _packageFragments('<root>': FqName@25) = LazyJavaPackageFragment@26['<root>']
-    _packageFragments('Any': FqName@27) = null
-    _packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
-    _packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
-    _packageFragments('java.lang.Any': FqName@32) = null
-    _packageFragments('java.lang.platformName': FqName@33) = null
-    _packageFragments('kotlin': FqName@34) = LazyJavaPackageFragment@35['kotlin']
-    _packageFragments('kotlin.Any': FqName@36) = null
-    _packageFragments('kotlin.io': FqName@37) = LazyJavaPackageFragment@38['io']
-    _packageFragments('kotlin.io.Any': FqName@39) = null
-    _packageFragments('kotlin.io.platformName': FqName@40) = null
-    _packageFragments('kotlin.jvm': FqName@41) = LazyJavaPackageFragment@42['jvm']
-    _packageFragments('kotlin.jvm.Any': FqName@43) = null
-    _packageFragments('kotlin.jvm.platformName': FqName@44) = null
-    _packageFragments('kotlin.platform': FqName@45) = LazyJavaPackageFragment@3['platform']
-    _packageFragments('kotlin.platform.Any': FqName@46) = null
-    _packageFragments('kotlin.platform.platformName': FqName@47) = null
-    _packageFragments('kotlin.platformName': FqName@48) = null
-    _packageFragments('platformName': FqName@49) = null
+    packageFragments('<root>': FqName@25) = LazyJavaPackageFragment@26['<root>']
+    packageFragments('Any': FqName@27) = null
+    packageFragments('java': FqName@28) = LazyJavaPackageFragment@29['java']
+    packageFragments('java.lang': FqName@30) = LazyJavaPackageFragment@31['lang']
+    packageFragments('java.lang.Any': FqName@32) = null
+    packageFragments('java.lang.platformName': FqName@33) = null
+    packageFragments('kotlin': FqName@34) = LazyJavaPackageFragment@35['kotlin']
+    packageFragments('kotlin.Any': FqName@36) = null
+    packageFragments('kotlin.io': FqName@37) = LazyJavaPackageFragment@38['io']
+    packageFragments('kotlin.io.Any': FqName@39) = null
+    packageFragments('kotlin.io.platformName': FqName@40) = null
+    packageFragments('kotlin.jvm': FqName@41) = LazyJavaPackageFragment@42['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@43) = null
+    packageFragments('kotlin.jvm.platformName': FqName@44) = null
+    packageFragments('kotlin.platform': FqName@45) = LazyJavaPackageFragment@3['platform']
+    packageFragments('kotlin.platform.Any': FqName@46) = null
+    packageFragments('kotlin.platform.platformName': FqName@47) = null
+    packageFragments('kotlin.platformName': FqName@48) = null
+    packageFragments('platformName': FqName@49) = null
 }

 LazyJavaPackageFragment@26['<root>'] {
-    _functions('kotlin': Name@50) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('Any': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('kotlin': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('platformName': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@52
-    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('kotlin': Name@52) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    classes('platformName': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@51
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@51
+    functions('kotlin': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@51
+    memberIndex = computeMemberIndex$1@57 // through LazyPackageFragmentScopeForJavaPackage@51
 }

 LazyJavaPackageFragment@38['io'] {
-    classes('Any': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@58
+    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@58
 }

 LazyJavaPackageFragment@29['java'] {
-    _functions('lang': Name@59) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@60
-    classes('lang': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@60
-    deserializedPackageScope = Empty@56 // through LazyPackageFragmentScopeForJavaPackage@60
+    classes('lang': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@60
+    deserializedPackageScope = Empty@54 // through LazyPackageFragmentScopeForJavaPackage@60
+    functions('lang': Name@61) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@60
    memberIndex = computeMemberIndex$1@62 // through LazyPackageFragmentScopeForJavaPackage@60
 }

 LazyJavaPackageFragment@42['jvm'] {
-    classes('Any': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@63
 }

 LazyJavaPackageFragment@35['kotlin'] {
-    _functions('io': Name@64) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('jvm': Name@66) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    _functions('platform': Name@67) = EmptyList@51[empty] // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('Any': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('String': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('io': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('jvm': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    classes('platform': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@65
-    deserializedPackageScope = DeserializedPackageMemberScope@72 // through LazyPackageFragmentScopeForJavaPackage@65
-    functions('io': Name@64) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('jvm': Name@66) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    functions('platform': Name@67) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@65
-    membersProtos = HashMap@74 // through DeserializedPackageMemberScope@72
-    properties('io': Name@64) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('jvm': Name@66) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
-    properties('platform': Name@67) = EmptyList@51[empty] // through DeserializedPackageMemberScope@72
+    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('String': Name@65) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('io': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('jvm': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('platform': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = DeserializedPackageMemberScope@69 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('io': Name@70) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
+    functions('io': Name@70) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('jvm': Name@71) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
+    functions('jvm': Name@71) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('platform': Name@72) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
+    functions('platform': Name@72) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@64
+    memberIndex = computeMemberIndex$1@73 // through LazyPackageFragmentScopeForJavaPackage@64
+    membersProtos = HashMap@74 // through DeserializedPackageMemberScope@69
+    properties('io': Name@70) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
+    properties('jvm': Name@71) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
+    properties('platform': Name@72) = EmptyList@56[empty] // through DeserializedPackageMemberScope@69
 }

 LazyJavaPackageFragment@3['platform'] {
-    classes('Any': Name@53) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('platformName': Name@55) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('Any': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('platformName': Name@53) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@75
 }

 TypeDeserializer@76 {
@@ -19,204 +19,204 @@ DeserializedType@9['kotlin.String'] {
 }

 LazyAnnotationDescriptor@11 {
-    _resolutionResults = OverloadResolutionResultsImpl@12
-    _type = JetTypeImpl@13['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@15
+    resolutionResults = OverloadResolutionResultsImpl@12
+    type = JetTypeImpl@13['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@15
 }

 LazyAnnotationDescriptor@16 {
-    _resolutionResults = OverloadResolutionResultsImpl@17
-    _type = JetTypeImpl@18['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@19
+    resolutionResults = OverloadResolutionResultsImpl@17
+    type = JetTypeImpl@18['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@19
 }

 LazyAnnotationDescriptor@20 {
-    _resolutionResults = OverloadResolutionResultsImpl@21
-    _type = JetTypeImpl@22['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@23
+    resolutionResults = OverloadResolutionResultsImpl@21
+    type = JetTypeImpl@22['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@23
 }

 LazyAnnotationDescriptor@24 {
-    _resolutionResults = OverloadResolutionResultsImpl@25
-    _type = JetTypeImpl@26['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@27
+    resolutionResults = OverloadResolutionResultsImpl@25
+    type = JetTypeImpl@26['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@27
 }

 LazyAnnotationDescriptor@28 {
-    _resolutionResults = OverloadResolutionResultsImpl@29
-    _type = JetTypeImpl@30['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@31
+    resolutionResults = OverloadResolutionResultsImpl@29
+    type = JetTypeImpl@30['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@31
 }

 LazyAnnotationDescriptor@32 {
-    _resolutionResults = OverloadResolutionResultsImpl@33
-    _type = JetTypeImpl@34['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@35
+    resolutionResults = OverloadResolutionResultsImpl@33
+    type = JetTypeImpl@34['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@35
 }

 LazyAnnotationDescriptor@36 {
-    _resolutionResults = OverloadResolutionResultsImpl@37
-    _type = JetTypeImpl@38['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@39
+    resolutionResults = OverloadResolutionResultsImpl@37
+    type = JetTypeImpl@38['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@39
 }

 LazyAnnotationDescriptor@40 {
-    _resolutionResults = OverloadResolutionResultsImpl@41
-    _type = JetTypeImpl@42['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@43
+    resolutionResults = OverloadResolutionResultsImpl@41
+    type = JetTypeImpl@42['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@43
 }

 LazyAnnotationDescriptor@44 {
-    _resolutionResults = OverloadResolutionResultsImpl@45
-    _type = JetTypeImpl@46['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@47
+    resolutionResults = OverloadResolutionResultsImpl@45
+    type = JetTypeImpl@46['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@47
 }

 LazyAnnotationDescriptor@48 {
-    _resolutionResults = OverloadResolutionResultsImpl@49
-    _type = JetTypeImpl@50['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@51
+    resolutionResults = OverloadResolutionResultsImpl@49
+    type = JetTypeImpl@50['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@51
 }

 LazyAnnotationDescriptor@52 {
-    _resolutionResults = OverloadResolutionResultsImpl@53
-    _type = JetTypeImpl@54['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@55
+    resolutionResults = OverloadResolutionResultsImpl@53
+    type = JetTypeImpl@54['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@55
 }

 LazyAnnotationDescriptor@56 {
-    _resolutionResults = OverloadResolutionResultsImpl@57
-    _type = JetTypeImpl@58['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@59
+    resolutionResults = OverloadResolutionResultsImpl@57
+    type = JetTypeImpl@58['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@59
 }

 LazyAnnotationDescriptor@60 {
-    _resolutionResults = OverloadResolutionResultsImpl@61
-    _type = JetTypeImpl@62['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@63
+    resolutionResults = OverloadResolutionResultsImpl@61
+    type = JetTypeImpl@62['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@63
 }

 LazyAnnotationDescriptor@64 {
-    _resolutionResults = OverloadResolutionResultsImpl@65
-    _type = JetTypeImpl@66['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@67
+    resolutionResults = OverloadResolutionResultsImpl@65
+    type = JetTypeImpl@66['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@67
 }

 LazyAnnotationDescriptor@68 {
-    _resolutionResults = OverloadResolutionResultsImpl@69
-    _type = JetTypeImpl@70['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@71
+    resolutionResults = OverloadResolutionResultsImpl@69
+    type = JetTypeImpl@70['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@71
 }

 LazyAnnotationDescriptor@72 {
-    _resolutionResults = OverloadResolutionResultsImpl@73
-    _type = JetTypeImpl@74['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@75
+    resolutionResults = OverloadResolutionResultsImpl@73
+    type = JetTypeImpl@74['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@75
 }

 LazyAnnotationDescriptor@76 {
-    _resolutionResults = OverloadResolutionResultsImpl@77
-    _type = JetTypeImpl@78['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@79
+    resolutionResults = OverloadResolutionResultsImpl@77
+    type = JetTypeImpl@78['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@79
 }

 LazyAnnotationDescriptor@80 {
-    _resolutionResults = OverloadResolutionResultsImpl@81
-    _type = JetTypeImpl@82['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@83
+    resolutionResults = OverloadResolutionResultsImpl@81
+    type = JetTypeImpl@82['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@83
 }

 LazyAnnotationDescriptor@84 {
-    _resolutionResults = OverloadResolutionResultsImpl@85
-    _type = JetTypeImpl@86['platformName']
-    _valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@87
+    resolutionResults = OverloadResolutionResultsImpl@85
+    type = JetTypeImpl@86['platformName']
+    valueArguments(ValueParameterDescriptorImpl@14['name']) = StringValue@87
 }

 LazyJavaPackageFragmentProvider@88 {
-    _packageFragments('<root>': FqName@89) = LazyJavaPackageFragment@90['<root>']
-    _packageFragments('Any': FqName@91) = null
-    _packageFragments('C': FqName@92) = null
-    _packageFragments('Int': FqName@93) = null
-    _packageFragments('java': FqName@94) = LazyJavaPackageFragment@95['java']
-    _packageFragments('java.lang': FqName@96) = LazyJavaPackageFragment@97['lang']
-    _packageFragments('java.lang.Any': FqName@98) = null
-    _packageFragments('java.lang.Int': FqName@99) = null
-    _packageFragments('java.lang.platformName': FqName@100) = null
-    _packageFragments('kotlin': FqName@101) = LazyJavaPackageFragment@102['kotlin']
-    _packageFragments('kotlin.Any': FqName@103) = null
-    _packageFragments('kotlin.Int': FqName@104) = null
-    _packageFragments('kotlin.io': FqName@105) = LazyJavaPackageFragment@106['io']
-    _packageFragments('kotlin.io.Any': FqName@107) = null
-    _packageFragments('kotlin.io.Int': FqName@108) = null
-    _packageFragments('kotlin.io.platformName': FqName@109) = null
-    _packageFragments('kotlin.jvm': FqName@110) = LazyJavaPackageFragment@111['jvm']
-    _packageFragments('kotlin.jvm.Any': FqName@112) = null
-    _packageFragments('kotlin.jvm.Int': FqName@113) = null
-    _packageFragments('kotlin.jvm.platformName': FqName@114) = null
-    _packageFragments('kotlin.platform': FqName@115) = LazyJavaPackageFragment@7['platform']
-    _packageFragments('kotlin.platform.Any': FqName@116) = null
-    _packageFragments('kotlin.platform.Int': FqName@117) = null
-    _packageFragments('kotlin.platform.platformName': FqName@118) = null
-    _packageFragments('kotlin.platformName': FqName@119) = null
-    _packageFragments('platformName': FqName@120) = null
-    _packageFragments('px': FqName@121) = null
-    _packageFragments('valx': FqName@122) = null
-    _packageFragments('vardef': FqName@123) = null
-    _packageFragments('varx': FqName@124) = null
+    packageFragments('<root>': FqName@89) = LazyJavaPackageFragment@90['<root>']
+    packageFragments('Any': FqName@91) = null
+    packageFragments('C': FqName@92) = null
+    packageFragments('Int': FqName@93) = null
+    packageFragments('java': FqName@94) = LazyJavaPackageFragment@95['java']
+    packageFragments('java.lang': FqName@96) = LazyJavaPackageFragment@97['lang']
+    packageFragments('java.lang.Any': FqName@98) = null
+    packageFragments('java.lang.Int': FqName@99) = null
+    packageFragments('java.lang.platformName': FqName@100) = null
+    packageFragments('kotlin': FqName@101) = LazyJavaPackageFragment@102['kotlin']
+    packageFragments('kotlin.Any': FqName@103) = null
+    packageFragments('kotlin.Int': FqName@104) = null
+    packageFragments('kotlin.io': FqName@105) = LazyJavaPackageFragment@106['io']
+    packageFragments('kotlin.io.Any': FqName@107) = null
+    packageFragments('kotlin.io.Int': FqName@108) = null
+    packageFragments('kotlin.io.platformName': FqName@109) = null
+    packageFragments('kotlin.jvm': FqName@110) = LazyJavaPackageFragment@111['jvm']
+    packageFragments('kotlin.jvm.Any': FqName@112) = null
+    packageFragments('kotlin.jvm.Int': FqName@113) = null
+    packageFragments('kotlin.jvm.platformName': FqName@114) = null
+    packageFragments('kotlin.platform': FqName@115) = LazyJavaPackageFragment@7['platform']
+    packageFragments('kotlin.platform.Any': FqName@116) = null
+    packageFragments('kotlin.platform.Int': FqName@117) = null
+    packageFragments('kotlin.platform.platformName': FqName@118) = null
+    packageFragments('kotlin.platformName': FqName@119) = null
+    packageFragments('platformName': FqName@120) = null
+    packageFragments('px': FqName@121) = null
+    packageFragments('valx': FqName@122) = null
+    packageFragments('vardef': FqName@123) = null
+    packageFragments('varx': FqName@124) = null
 }

 LazyJavaPackageFragment@90['<root>'] {
-    _functions('kotlin': Name@125) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Any': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('kotlin': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    classes('platformName': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@127
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@127
-    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@127
+    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('kotlin': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    classes('platformName': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@126
+    deserializedPackageScope = Empty@130 // through LazyPackageFragmentScopeForJavaPackage@126
+    functions('kotlin': Name@131) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@126
+    memberIndex = computeMemberIndex$1@133 // through LazyPackageFragmentScopeForJavaPackage@126
 }

 LazyJavaPackageFragment@106['io'] {
-    classes('Any': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@134
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@134
+    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@134
 }

 LazyJavaPackageFragment@95['java'] {
-    _functions('lang': Name@135) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@136
-    classes('lang': Name@137) = null // through LazyPackageFragmentScopeForJavaPackage@136
-    deserializedPackageScope = Empty@132 // through LazyPackageFragmentScopeForJavaPackage@136
+    classes('lang': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@136
+    deserializedPackageScope = Empty@130 // through LazyPackageFragmentScopeForJavaPackage@136
+    functions('lang': Name@137) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@136
    memberIndex = computeMemberIndex$1@138 // through LazyPackageFragmentScopeForJavaPackage@136
 }

 LazyJavaPackageFragment@111['jvm'] {
-    classes('Any': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@139
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@139
+    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@139
 }

 LazyJavaPackageFragment@102['kotlin'] {
-    _functions('io': Name@140) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    _functions('jvm': Name@142) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    _functions('platform': Name@143) = EmptyList@126[empty] // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('Any': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('String': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('io': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('jvm': Name@146) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    classes('platform': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@141
-    deserializedPackageScope = DeserializedPackageMemberScope@148 // through LazyPackageFragmentScopeForJavaPackage@141
-    functions('io': Name@140) = EmptyList@126[empty] // through DeserializedPackageMemberScope@148
-    functions('jvm': Name@142) = EmptyList@126[empty] // through DeserializedPackageMemberScope@148
-    functions('platform': Name@143) = EmptyList@126[empty] // through DeserializedPackageMemberScope@148
-    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@141
-    membersProtos = HashMap@150 // through DeserializedPackageMemberScope@148
-    properties('io': Name@140) = EmptyList@126[empty] // through DeserializedPackageMemberScope@148
-    properties('jvm': Name@142) = EmptyList@126[empty] // through DeserializedPackageMemberScope@148
-    properties('platform': Name@143) = EmptyList@126[empty] // through DeserializedPackageMemberScope@148
+    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('String': Name@141) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('io': Name@142) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('jvm': Name@143) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('platform': Name@144) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    deserializedPackageScope = DeserializedPackageMemberScope@145 // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('io': Name@146) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
+    functions('io': Name@146) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('jvm': Name@147) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
+    functions('jvm': Name@147) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('platform': Name@148) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
+    functions('platform': Name@148) = EmptyList@132[empty] // through LazyPackageFragmentScopeForJavaPackage@140
+    memberIndex = computeMemberIndex$1@149 // through LazyPackageFragmentScopeForJavaPackage@140
+    membersProtos = HashMap@150 // through DeserializedPackageMemberScope@145
+    properties('io': Name@146) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
+    properties('jvm': Name@147) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
+    properties('platform': Name@148) = EmptyList@132[empty] // through DeserializedPackageMemberScope@145
 }

 LazyJavaPackageFragment@7['platform'] {
-    classes('Any': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('platformName': Name@131) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('Any': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('Int': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@151
+    classes('platformName': Name@129) = DeserializedClassDescriptor@2['platformName'] // through LazyPackageFragmentScopeForJavaPackage@151
 }

 TypeDeserializer@152 {
@@ -60,12 +60,12 @@ DeserializedType@33['java.lang.Class'] {
    memberScope = SubstitutingScope@35
 }

-DeserializedType@24['kotlin.Any'] {
+DeserializedType@28['kotlin.Any'] {
    constructor = DeserializedClassTypeConstructor@36
    memberScope = DeserializedClassMemberScope@37
 }

-DeserializedType@28['kotlin.Any'] {
+DeserializedType@24['kotlin.Any'] {
    constructor = DeserializedClassTypeConstructor@36
    memberScope = DeserializedClassMemberScope@37
 }
@@ -89,204 +89,204 @@ DeserializedType@45['kotlin.IntArray'] {
 }

 LazyAnnotationDescriptor@47 {
-    _resolutionResults = OverloadResolutionResultsImpl@48
-    _type = JetTypeImpl@49['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@51
+    resolutionResults = OverloadResolutionResultsImpl@48
+    type = JetTypeImpl@49['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@51
 }

 LazyAnnotationDescriptor@52 {
-    _resolutionResults = OverloadResolutionResultsImpl@53
-    _type = JetTypeImpl@54['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@55
+    resolutionResults = OverloadResolutionResultsImpl@53
+    type = JetTypeImpl@54['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@55
 }

 LazyAnnotationDescriptor@56 {
-    _resolutionResults = OverloadResolutionResultsImpl@57
-    _type = JetTypeImpl@58['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@59
+    resolutionResults = OverloadResolutionResultsImpl@57
+    type = JetTypeImpl@58['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@59
 }

 LazyAnnotationDescriptor@60 {
-    _resolutionResults = OverloadResolutionResultsImpl@61
-    _type = JetTypeImpl@62['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@63
+    resolutionResults = OverloadResolutionResultsImpl@61
+    type = JetTypeImpl@62['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@63
 }

 LazyAnnotationDescriptor@64 {
-    _resolutionResults = OverloadResolutionResultsImpl@65
-    _type = JetTypeImpl@66['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@67
+    resolutionResults = OverloadResolutionResultsImpl@65
+    type = JetTypeImpl@66['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@67
 }

 LazyAnnotationDescriptor@68 {
-    _resolutionResults = OverloadResolutionResultsImpl@69
-    _type = JetTypeImpl@70['AnnAnn']
-    _valueArguments(ValueParameterDescriptorImpl@71['i']) = ArrayValue@72
+    resolutionResults = OverloadResolutionResultsImpl@69
+    type = JetTypeImpl@70['AnnAnn']
+    valueArguments(ValueParameterDescriptorImpl@71['i']) = ArrayValue@72
 }

 LazyAnnotationDescriptor@73 {
-    _resolutionResults = OverloadResolutionResultsImpl@74
-    _type = JetTypeImpl@75['AnnAnn']
-    _valueArguments(ValueParameterDescriptorImpl@71['i']) = ArrayValue@76
+    resolutionResults = OverloadResolutionResultsImpl@74
+    type = JetTypeImpl@75['AnnAnn']
+    valueArguments(ValueParameterDescriptorImpl@71['i']) = ArrayValue@76
 }

 LazyAnnotationDescriptor@77 {
-    _resolutionResults = OverloadResolutionResultsImpl@78
-    _type = JetTypeImpl@79['AnnJC']
-    _valueArguments(ValueParameterDescriptorImpl@80['i']) = ArrayValue@81
+    resolutionResults = OverloadResolutionResultsImpl@78
+    type = JetTypeImpl@79['AnnJC']
+    valueArguments(ValueParameterDescriptorImpl@80['i']) = ArrayValue@81
 }

 LazyAnnotationDescriptor@82 {
-    _resolutionResults = OverloadResolutionResultsImpl@83
-    _type = JetTypeImpl@84['AnnJC']
-    _valueArguments(ValueParameterDescriptorImpl@80['i']) = ArrayValue@85
+    resolutionResults = OverloadResolutionResultsImpl@83
+    type = JetTypeImpl@84['AnnJC']
+    valueArguments(ValueParameterDescriptorImpl@80['i']) = ArrayValue@85
 }

 LazyJavaClassDescriptor@86['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@87['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@87['AnnotatedElement']
 }

 LazyJavaClassDescriptor@88['Class'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@34['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@34['Class']
 }

 LazyJavaClassDescriptor@89['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@90['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@90['GenericDeclaration']
 }

 LazyJavaClassDescriptor@91['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
 }

 LazyJavaClassDescriptor@93['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@94['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@94['Type']
 }

 LazyJavaClassTypeConstructor@87['AnnotatedElement'] {
-    _supertypes = ArrayList@95[1] { JetTypeImpl@96['Any'] }
+    supertypes = ArrayList@95[1] { JetTypeImpl@96['Any'] }
 }

 LazyJavaClassTypeConstructor@34['Class'] {
-    _parameters = ArrayList@97[1] { LazyJavaTypeParameterDescriptor@98['T'] }
-    _supertypes = ArrayList@99[4] { LazyJavaClassifierType@100['Serializable'], LazyJavaClassifierType@101['GenericDeclaration'], LazyJavaClassifierType@102['Type'], ... }
+    parameters = ArrayList@97[1] { LazyJavaTypeParameterDescriptor@98['T'] }
+    supertypes = ArrayList@99[4] { LazyJavaClassifierType@100['Serializable'], LazyJavaClassifierType@101['GenericDeclaration'], LazyJavaClassifierType@102['Type'], ... }
 }

 LazyJavaClassTypeConstructor@90['GenericDeclaration'] {
-    _supertypes = ArrayList@103[1] { JetTypeImpl@96['Any'] }
+    supertypes = ArrayList@103[1] { JetTypeImpl@96['Any'] }
 }

 LazyJavaClassTypeConstructor@92['Serializable'] {
-    _parameters = ArrayList@104[empty]
-    _supertypes = ArrayList@105[1] { JetTypeImpl@96['Any'] }
+    parameters = ArrayList@104[empty]
+    supertypes = ArrayList@105[1] { JetTypeImpl@96['Any'] }
 }

 LazyJavaClassTypeConstructor@94['Type'] {
-    _supertypes = ArrayList@106[1] { JetTypeImpl@96['Any'] }
+    supertypes = ArrayList@106[1] { JetTypeImpl@96['Any'] }
 }

 LazyJavaClassifierType@107['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@87['AnnotatedElement']
    classifier = JavaClassImpl@108['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@87['AnnotatedElement']
 }

 LazyJavaClassifierType@101['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@90['GenericDeclaration']
    classifier = JavaClassImpl@109['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@90['GenericDeclaration']
 }

 LazyJavaClassifierType@110['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@111['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@112['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@113['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@114['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@115['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@116['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@117['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@118['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@119['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@100['Serializable'] {
-    _arguments = ArrayList@120[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
+    arguments = ArrayList@120[empty]
    classifier = JavaClassImpl@121['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@92['Serializable']
 }

 LazyJavaClassifierType@102['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@94['Type']
    classifier = JavaClassImpl@122['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@94['Type']
 }

 LazyJavaPackageFragmentProvider@123 {
-    _packageFragments('<root>': FqName@124) = LazyJavaPackageFragment@125['<root>']
-    _packageFragments('Ann': FqName@126) = null
-    _packageFragments('AnnAnn': FqName@127) = null
-    _packageFragments('AnnJC': FqName@128) = null
-    _packageFragments('Array': FqName@129) = null
-    _packageFragments('Class': FqName@130) = null
-    _packageFragments('Int': FqName@131) = null
-    _packageFragments('IntArray': FqName@132) = null
-    _packageFragments('Test': FqName@133) = null
-    _packageFragments('TestAnn': FqName@134) = null
-    _packageFragments('TestJC': FqName@135) = null
-    _packageFragments('i': FqName@136) = null
-    _packageFragments('i2': FqName@137) = null
-    _packageFragments('i3': FqName@138) = null
-    _packageFragments('iAnn': FqName@139) = null
-    _packageFragments('iJC': FqName@140) = null
-    _packageFragments('java': FqName@141) = LazyJavaPackageFragment@142['java']
-    _packageFragments('java.io': FqName@143) = LazyJavaPackageFragment@144['io']
-    _packageFragments('java.lang': FqName@145) = LazyJavaPackageFragment@146['lang']
-    _packageFragments('java.lang.Ann': FqName@147) = null
-    _packageFragments('java.lang.AnnAnn': FqName@148) = null
-    _packageFragments('java.lang.AnnJC': FqName@149) = null
-    _packageFragments('java.lang.Array': FqName@150) = null
-    _packageFragments('java.lang.Class': FqName@151) = null
-    _packageFragments('java.lang.Int': FqName@152) = null
-    _packageFragments('java.lang.IntArray': FqName@153) = null
-    _packageFragments('java.lang.Test': FqName@154) = null
-    _packageFragments('java.lang.reflect': FqName@155) = LazyJavaPackageFragment@156['reflect']
-    _packageFragments('kotlin': FqName@157) = LazyJavaPackageFragment@19['kotlin']
-    _packageFragments('kotlin.Ann': FqName@158) = null
-    _packageFragments('kotlin.AnnAnn': FqName@159) = null
-    _packageFragments('kotlin.AnnJC': FqName@160) = null
-    _packageFragments('kotlin.Array': FqName@161) = null
-    _packageFragments('kotlin.Class': FqName@162) = null
-    _packageFragments('kotlin.Int': FqName@163) = null
-    _packageFragments('kotlin.IntArray': FqName@164) = null
-    _packageFragments('kotlin.Test': FqName@165) = null
-    _packageFragments('kotlin.io': FqName@166) = LazyJavaPackageFragment@167['io']
-    _packageFragments('kotlin.io.Ann': FqName@168) = null
-    _packageFragments('kotlin.io.AnnAnn': FqName@169) = null
-    _packageFragments('kotlin.io.AnnJC': FqName@170) = null
-    _packageFragments('kotlin.io.Array': FqName@171) = null
-    _packageFragments('kotlin.io.Class': FqName@172) = null
-    _packageFragments('kotlin.io.Int': FqName@173) = null
-    _packageFragments('kotlin.io.IntArray': FqName@174) = null
-    _packageFragments('kotlin.io.Test': FqName@175) = null
-    _packageFragments('kotlin.jvm': FqName@176) = LazyJavaPackageFragment@177['jvm']
-    _packageFragments('kotlin.jvm.Ann': FqName@178) = null
-    _packageFragments('kotlin.jvm.AnnAnn': FqName@179) = null
-    _packageFragments('kotlin.jvm.AnnJC': FqName@180) = null
-    _packageFragments('kotlin.jvm.Array': FqName@181) = null
-    _packageFragments('kotlin.jvm.Class': FqName@182) = null
-    _packageFragments('kotlin.jvm.Int': FqName@183) = null
-    _packageFragments('kotlin.jvm.IntArray': FqName@184) = null
-    _packageFragments('kotlin.jvm.Test': FqName@185) = null
-    _packageFragments('kotlin.jvm.internal': FqName@186) = LazyJavaPackageFragment@16['internal']
+    packageFragments('<root>': FqName@124) = LazyJavaPackageFragment@125['<root>']
+    packageFragments('Ann': FqName@126) = null
+    packageFragments('AnnAnn': FqName@127) = null
+    packageFragments('AnnJC': FqName@128) = null
+    packageFragments('Array': FqName@129) = null
+    packageFragments('Class': FqName@130) = null
+    packageFragments('Int': FqName@131) = null
+    packageFragments('IntArray': FqName@132) = null
+    packageFragments('Test': FqName@133) = null
+    packageFragments('TestAnn': FqName@134) = null
+    packageFragments('TestJC': FqName@135) = null
+    packageFragments('i': FqName@136) = null
+    packageFragments('i2': FqName@137) = null
+    packageFragments('i3': FqName@138) = null
+    packageFragments('iAnn': FqName@139) = null
+    packageFragments('iJC': FqName@140) = null
+    packageFragments('java': FqName@141) = LazyJavaPackageFragment@142['java']
+    packageFragments('java.io': FqName@143) = LazyJavaPackageFragment@144['io']
+    packageFragments('java.lang': FqName@145) = LazyJavaPackageFragment@146['lang']
+    packageFragments('java.lang.Ann': FqName@147) = null
+    packageFragments('java.lang.AnnAnn': FqName@148) = null
+    packageFragments('java.lang.AnnJC': FqName@149) = null
+    packageFragments('java.lang.Array': FqName@150) = null
+    packageFragments('java.lang.Class': FqName@151) = null
+    packageFragments('java.lang.Int': FqName@152) = null
+    packageFragments('java.lang.IntArray': FqName@153) = null
+    packageFragments('java.lang.Test': FqName@154) = null
+    packageFragments('java.lang.reflect': FqName@155) = LazyJavaPackageFragment@156['reflect']
+    packageFragments('kotlin': FqName@157) = LazyJavaPackageFragment@19['kotlin']
+    packageFragments('kotlin.Ann': FqName@158) = null
+    packageFragments('kotlin.AnnAnn': FqName@159) = null
+    packageFragments('kotlin.AnnJC': FqName@160) = null
+    packageFragments('kotlin.Array': FqName@161) = null
+    packageFragments('kotlin.Class': FqName@162) = null
+    packageFragments('kotlin.Int': FqName@163) = null
+    packageFragments('kotlin.IntArray': FqName@164) = null
+    packageFragments('kotlin.Test': FqName@165) = null
+    packageFragments('kotlin.io': FqName@166) = LazyJavaPackageFragment@167['io']
+    packageFragments('kotlin.io.Ann': FqName@168) = null
+    packageFragments('kotlin.io.AnnAnn': FqName@169) = null
+    packageFragments('kotlin.io.AnnJC': FqName@170) = null
+    packageFragments('kotlin.io.Array': FqName@171) = null
+    packageFragments('kotlin.io.Class': FqName@172) = null
+    packageFragments('kotlin.io.Int': FqName@173) = null
+    packageFragments('kotlin.io.IntArray': FqName@174) = null
+    packageFragments('kotlin.io.Test': FqName@175) = null
+    packageFragments('kotlin.jvm': FqName@176) = LazyJavaPackageFragment@177['jvm']
+    packageFragments('kotlin.jvm.Ann': FqName@178) = null
+    packageFragments('kotlin.jvm.AnnAnn': FqName@179) = null
+    packageFragments('kotlin.jvm.AnnJC': FqName@180) = null
+    packageFragments('kotlin.jvm.Array': FqName@181) = null
+    packageFragments('kotlin.jvm.Class': FqName@182) = null
+    packageFragments('kotlin.jvm.Int': FqName@183) = null
+    packageFragments('kotlin.jvm.IntArray': FqName@184) = null
+    packageFragments('kotlin.jvm.Test': FqName@185) = null
+    packageFragments('kotlin.jvm.internal': FqName@186) = LazyJavaPackageFragment@16['internal']
    topLevelClasses(JavaClassImpl@108['AnnotatedElement']) = LazyJavaClassDescriptor@86['AnnotatedElement']
    topLevelClasses(JavaClassImpl@187['Class']) = LazyJavaClassDescriptor@88['Class']
    topLevelClasses(JavaClassImpl@109['GenericDeclaration']) = LazyJavaClassDescriptor@89['GenericDeclaration']
@@ -295,27 +295,27 @@ LazyJavaPackageFragmentProvider@123 {
 }

 LazyJavaPackageFragment@125['<root>'] {
-    _functions('Ann': Name@188) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    _functions('array': Name@191) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    _functions('foo': Name@192) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    _functions('intArray': Name@193) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    _functions('javaClass': Name@194) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('Array': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('Class': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('Int': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('IntArray': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('array': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('foo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('intArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    classes('javaClass': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@190
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@190
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@190
+    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@189
+    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@189
 }

 LazyJavaPackageFragment@16['internal'] {
@@ -323,144 +323,144 @@ LazyJavaPackageFragment@16['internal'] {
 }

 LazyJavaPackageFragment@167['io'] {
-    _functions('Ann': Name@188) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('array': Name@191) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('foo': Name@192) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('intArray': Name@193) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('javaClass': Name@194) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@208
    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Array': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Class': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Int': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('IntArray': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('array': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('foo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('intArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('javaClass': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@208
    deserializedPackageScope = DeserializedPackageMemberScope@209 // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('Ann': Name@188) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    functions('array': Name@191) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    functions('foo': Name@192) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    functions('intArray': Name@193) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    functions('javaClass': Name@194) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
+    functions('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@208
    membersProtos = HashMap@211 // through DeserializedPackageMemberScope@209
-    properties('Ann': Name@188) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('array': Name@191) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('foo': Name@192) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('i': Name@199) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('i2': Name@200) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('i3': Name@201) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('iAnn': Name@202) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('iJC': Name@203) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('intArray': Name@193) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
-    properties('javaClass': Name@194) = EmptyList@189[empty] // through DeserializedPackageMemberScope@209
+    properties('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
 }

 LazyJavaPackageFragment@142['java'] {
-    _functions('lang': Name@212) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('lang': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('lang': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('lang': Name@214) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@213
    memberIndex = computeMemberIndex$1@215 // through LazyPackageFragmentScopeForJavaPackage@213
 }

 LazyJavaPackageFragment@177['jvm'] {
-    _functions('Ann': Name@188) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('array': Name@191) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('foo': Name@192) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('intArray': Name@193) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('javaClass': Name@194) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@216
    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Array': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Class': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Int': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('IntArray': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('array': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('foo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('intArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('javaClass': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
    memberIndex = computeMemberIndex$1@217 // through LazyPackageFragmentScopeForJavaPackage@216
 }

 LazyJavaPackageFragment@19['kotlin'] {
-    _functions('Ann': Name@188) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('array': Name@191) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('foo': Name@192) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('intArray': Name@193) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('io': Name@219) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('javaClass': Name@194) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('jvm': Name@220) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@218
    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Any': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Array': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Class': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Int': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('IntArray': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('array': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('foo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('inline': Name@222) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('intArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('io': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('javaClass': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('jvm': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    deserializedPackageScope = DeserializedPackageMemberScope@225 // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('Ann': Name@188) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    functions('array': Name@191) = ArrayList@226[1] { DeserializedSimpleFunctionDescriptor@227['array'] } // through DeserializedPackageMemberScope@225
-    functions('foo': Name@192) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    functions('intArray': Name@193) = ArrayList@228[1] { DeserializedSimpleFunctionDescriptor@229['intArray'] } // through DeserializedPackageMemberScope@225
-    functions('io': Name@219) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    functions('javaClass': Name@194) = ArrayList@230[1] { DeserializedSimpleFunctionDescriptor@231['javaClass'] } // through DeserializedPackageMemberScope@225
-    functions('jvm': Name@220) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
+    classes('Any': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('Array': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('Class': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('Int': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('IntArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('inline': Name@220) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('io': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('jvm': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    deserializedPackageScope = DeserializedPackageMemberScope@223 // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('array': Name@194) = ArrayList@224[1] { DeserializedSimpleFunctionDescriptor@225['array'] } // through DeserializedPackageMemberScope@223
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('intArray': Name@201) = ArrayList@226[1] { DeserializedSimpleFunctionDescriptor@227['intArray'] } // through DeserializedPackageMemberScope@223
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('io': Name@228) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    functions('io': Name@228) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('javaClass': Name@202) = ArrayList@229[1] { DeserializedSimpleFunctionDescriptor@230['javaClass'] } // through DeserializedPackageMemberScope@223
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('jvm': Name@231) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    functions('jvm': Name@231) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
    memberIndex = computeMemberIndex$1@232 // through LazyPackageFragmentScopeForJavaPackage@218
-    membersProtos = HashMap@233 // through DeserializedPackageMemberScope@225
-    properties('Ann': Name@188) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('array': Name@191) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('foo': Name@192) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('i': Name@199) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('i2': Name@200) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('i3': Name@201) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('iAnn': Name@202) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('iJC': Name@203) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('intArray': Name@193) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('io': Name@219) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
-    properties('javaClass': Name@194) = ArrayList@234[1] { DeserializedPropertyDescriptor@235['javaClass'] } // through DeserializedPackageMemberScope@225
-    properties('jvm': Name@220) = EmptyList@189[empty] // through DeserializedPackageMemberScope@225
+    membersProtos = HashMap@233 // through DeserializedPackageMemberScope@223
+    properties('Ann': Name@188) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('io': Name@228) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
+    properties('javaClass': Name@202) = ArrayList@234[1] { DeserializedPropertyDescriptor@235['javaClass'] } // through DeserializedPackageMemberScope@223
+    properties('jvm': Name@231) = EmptyList@204[empty] // through DeserializedPackageMemberScope@223
 }

 LazyJavaPackageFragment@146['lang'] {
-    _functions('Ann': Name@188) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('array': Name@191) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('foo': Name@192) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('intArray': Name@193) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@236
-    _functions('javaClass': Name@194) = EmptyList@189[empty] // through LazyPackageFragmentScopeForJavaPackage@236
    classes('Ann': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('Class': Name@196) = LazyJavaClassDescriptor@88['Class'] // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('array': Name@191) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('foo': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('intArray': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    classes('javaClass': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@236
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('Class': Name@191) = LazyJavaClassDescriptor@88['Class'] // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@236
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@236
+    functions('Ann': Name@188) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@236
    memberIndex = computeMemberIndex$1@237 // through LazyPackageFragmentScopeForJavaPackage@236
 }

@@ -38,61 +38,61 @@ DeserializedType@16['kotlin.Any'] {
 }

 LazyAnnotationDescriptor@23 {
-    _resolutionResults = OverloadResolutionResultsImpl@24
-    _type = JetTypeImpl@25['AnnC']
-    _valueArguments(ValueParameterDescriptorImpl@26['c']) = JavaClassValue@27
+    resolutionResults = OverloadResolutionResultsImpl@24
+    type = JetTypeImpl@25['AnnC']
+    valueArguments(ValueParameterDescriptorImpl@26['c']) = JavaClassValue@27
 }

 LazyAnnotationDescriptor@28 {
-    _resolutionResults = OverloadResolutionResultsImpl@29
-    _type = JetTypeImpl@30['AnnC']
-    _valueArguments(ValueParameterDescriptorImpl@26['c']) = null
+    resolutionResults = OverloadResolutionResultsImpl@29
+    type = JetTypeImpl@30['AnnC']
+    valueArguments(ValueParameterDescriptorImpl@26['c']) = null
 }

 LazyJavaClassDescriptor@31['Class'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@19['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@19['Class']
 }

 LazyJavaClassTypeConstructor@19['Class'] {
-    _parameters = ArrayList@32[1] { LazyJavaTypeParameterDescriptor@33['T'] }
+    parameters = ArrayList@32[1] { LazyJavaTypeParameterDescriptor@33['T'] }
 }

 LazyJavaPackageFragmentProvider@34 {
-    _packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
-    _packageFragments('A': FqName@37) = null
-    _packageFragments('AnnC': FqName@38) = null
-    _packageFragments('Class': FqName@39) = null
-    _packageFragments('Test': FqName@40) = null
-    _packageFragments('Test2': FqName@41) = null
-    _packageFragments('c': FqName@42) = null
-    _packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
-    _packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
-    _packageFragments('java.lang.A': FqName@47) = null
-    _packageFragments('java.lang.AnnC': FqName@48) = null
-    _packageFragments('java.lang.Class': FqName@49) = null
-    _packageFragments('kotlin': FqName@50) = LazyJavaPackageFragment@11['kotlin']
-    _packageFragments('kotlin.A': FqName@51) = null
-    _packageFragments('kotlin.AnnC': FqName@52) = null
-    _packageFragments('kotlin.Class': FqName@53) = null
-    _packageFragments('kotlin.io': FqName@54) = LazyJavaPackageFragment@55['io']
-    _packageFragments('kotlin.io.A': FqName@56) = null
-    _packageFragments('kotlin.io.AnnC': FqName@57) = null
-    _packageFragments('kotlin.io.Class': FqName@58) = null
-    _packageFragments('kotlin.jvm': FqName@59) = LazyJavaPackageFragment@60['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@61) = null
-    _packageFragments('kotlin.jvm.AnnC': FqName@62) = null
-    _packageFragments('kotlin.jvm.Class': FqName@63) = null
-    _packageFragments('kotlin.jvm.internal': FqName@64) = LazyJavaPackageFragment@8['internal']
+    packageFragments('<root>': FqName@35) = LazyJavaPackageFragment@36['<root>']
+    packageFragments('A': FqName@37) = null
+    packageFragments('AnnC': FqName@38) = null
+    packageFragments('Class': FqName@39) = null
+    packageFragments('Test': FqName@40) = null
+    packageFragments('Test2': FqName@41) = null
+    packageFragments('c': FqName@42) = null
+    packageFragments('java': FqName@43) = LazyJavaPackageFragment@44['java']
+    packageFragments('java.lang': FqName@45) = LazyJavaPackageFragment@46['lang']
+    packageFragments('java.lang.A': FqName@47) = null
+    packageFragments('java.lang.AnnC': FqName@48) = null
+    packageFragments('java.lang.Class': FqName@49) = null
+    packageFragments('kotlin': FqName@50) = LazyJavaPackageFragment@11['kotlin']
+    packageFragments('kotlin.A': FqName@51) = null
+    packageFragments('kotlin.AnnC': FqName@52) = null
+    packageFragments('kotlin.Class': FqName@53) = null
+    packageFragments('kotlin.io': FqName@54) = LazyJavaPackageFragment@55['io']
+    packageFragments('kotlin.io.A': FqName@56) = null
+    packageFragments('kotlin.io.AnnC': FqName@57) = null
+    packageFragments('kotlin.io.Class': FqName@58) = null
+    packageFragments('kotlin.jvm': FqName@59) = LazyJavaPackageFragment@60['jvm']
+    packageFragments('kotlin.jvm.A': FqName@61) = null
+    packageFragments('kotlin.jvm.AnnC': FqName@62) = null
+    packageFragments('kotlin.jvm.Class': FqName@63) = null
+    packageFragments('kotlin.jvm.internal': FqName@64) = LazyJavaPackageFragment@8['internal']
    topLevelClasses(JavaClassImpl@65['Class']) = LazyJavaClassDescriptor@31['Class']
 }

 LazyJavaPackageFragment@36['<root>'] {
-    _functions('javaClass': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('Class': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('c': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('javaClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@68
-    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    memberIndex = computeMemberIndex$1@72 // through LazyPackageFragmentScopeForJavaPackage@67
 }

 LazyJavaPackageFragment@8['internal'] {
@@ -100,63 +100,63 @@ LazyJavaPackageFragment@8['internal'] {
 }

 LazyJavaPackageFragment@55['io'] {
-    _functions('javaClass': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('Class': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('c': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@75
-    classes('javaClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@75
+    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@75
    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@75
-    functions('javaClass': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@76
+    functions('javaClass': Name@69) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
+    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@75
    memberIndex = computeMemberIndex$1@77 // through LazyPackageFragmentScopeForJavaPackage@75
    membersProtos = HashMap@78 // through DeserializedPackageMemberScope@76
-    properties('c': Name@70) = EmptyList@67[empty] // through DeserializedPackageMemberScope@76
-    properties('javaClass': Name@66) = EmptyList@67[empty] // through DeserializedPackageMemberScope@76
+    properties('c': Name@68) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
+    properties('javaClass': Name@69) = EmptyList@71[empty] // through DeserializedPackageMemberScope@76
 }

 LazyJavaPackageFragment@44['java'] {
-    _functions('lang': Name@79) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@80
-    classes('lang': Name@81) = null // through LazyPackageFragmentScopeForJavaPackage@80
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@80
+    classes('lang': Name@79) = null // through LazyPackageFragmentScopeForJavaPackage@80
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@80
+    functions('lang': Name@81) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@80
    memberIndex = computeMemberIndex$1@82 // through LazyPackageFragmentScopeForJavaPackage@80
 }

 LazyJavaPackageFragment@60['jvm'] {
-    _functions('javaClass': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('Class': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('c': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    classes('javaClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@83
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@83
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@83
+    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@83
    memberIndex = computeMemberIndex$1@84 // through LazyPackageFragmentScopeForJavaPackage@83
 }

 LazyJavaPackageFragment@11['kotlin'] {
-    _functions('io': Name@85) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    _functions('javaClass': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    _functions('jvm': Name@87) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Any': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('Class': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('c': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('inline': Name@89) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('io': Name@90) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('javaClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    classes('jvm': Name@91) = null // through LazyPackageFragmentScopeForJavaPackage@86
-    deserializedPackageScope = DeserializedPackageMemberScope@92 // through LazyPackageFragmentScopeForJavaPackage@86
-    functions('io': Name@85) = EmptyList@67[empty] // through DeserializedPackageMemberScope@92
-    functions('javaClass': Name@66) = ArrayList@93[1] { DeserializedSimpleFunctionDescriptor@94['javaClass'] } // through DeserializedPackageMemberScope@92
-    functions('jvm': Name@87) = EmptyList@67[empty] // through DeserializedPackageMemberScope@92
+    classes('Any': Name@85) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('Class': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('inline': Name@87) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('io': Name@88) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    classes('jvm': Name@89) = null // through LazyPackageFragmentScopeForJavaPackage@86
+    deserializedPackageScope = DeserializedPackageMemberScope@90 // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('io': Name@91) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
+    functions('io': Name@91) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('javaClass': Name@69) = ArrayList@92[1] { DeserializedSimpleFunctionDescriptor@93['javaClass'] } // through DeserializedPackageMemberScope@90
+    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@86
+    functions('jvm': Name@94) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
+    functions('jvm': Name@94) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@86
    memberIndex = computeMemberIndex$1@95 // through LazyPackageFragmentScopeForJavaPackage@86
-    membersProtos = HashMap@96 // through DeserializedPackageMemberScope@92
-    properties('c': Name@70) = EmptyList@67[empty] // through DeserializedPackageMemberScope@92
-    properties('io': Name@85) = EmptyList@67[empty] // through DeserializedPackageMemberScope@92
-    properties('javaClass': Name@66) = ArrayList@97[1] { DeserializedPropertyDescriptor@98['javaClass'] } // through DeserializedPackageMemberScope@92
-    properties('jvm': Name@87) = EmptyList@67[empty] // through DeserializedPackageMemberScope@92
+    membersProtos = HashMap@96 // through DeserializedPackageMemberScope@90
+    properties('c': Name@68) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
+    properties('io': Name@91) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
+    properties('javaClass': Name@69) = ArrayList@97[1] { DeserializedPropertyDescriptor@98['javaClass'] } // through DeserializedPackageMemberScope@90
+    properties('jvm': Name@94) = EmptyList@71[empty] // through DeserializedPackageMemberScope@90
 }

 LazyJavaPackageFragment@46['lang'] {
-    _functions('javaClass': Name@66) = EmptyList@67[empty] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('Class': Name@69) = LazyJavaClassDescriptor@31['Class'] // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('c': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    classes('javaClass': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@99
-    deserializedPackageScope = Empty@71 // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('Class': Name@66) = LazyJavaClassDescriptor@31['Class'] // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('c': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    classes('javaClass': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@99
+    deserializedPackageScope = Empty@70 // through LazyPackageFragmentScopeForJavaPackage@99
+    functions('javaClass': Name@69) = EmptyList@71[empty] // through LazyPackageFragmentScopeForJavaPackage@99
    memberIndex = computeMemberIndex$1@100 // through LazyPackageFragmentScopeForJavaPackage@99
 }

@@ -67,123 +67,123 @@ DeserializedType@32['kotlin.IntArray'] {
 }

 LazyAnnotationDescriptor@34 {
-    _resolutionResults = OverloadResolutionResultsImpl@35
-    _type = JetTypeImpl@36['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@37['i']) = IntValue@38
+    resolutionResults = OverloadResolutionResultsImpl@35
+    type = JetTypeImpl@36['Ann']
+    valueArguments(ValueParameterDescriptorImpl@37['i']) = IntValue@38
 }

 LazyAnnotationDescriptor@39 {
-    _resolutionResults = OverloadResolutionResultsImpl@40
-    _type = JetTypeImpl@41['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@37['i']) = IntValue@42
+    resolutionResults = OverloadResolutionResultsImpl@40
+    type = JetTypeImpl@41['Ann']
+    valueArguments(ValueParameterDescriptorImpl@37['i']) = IntValue@42
 }

 LazyAnnotationDescriptor@43 {
-    _resolutionResults = OverloadResolutionResultsImpl@44
-    _type = JetTypeImpl@45['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@37['i']) = IntValue@46
+    resolutionResults = OverloadResolutionResultsImpl@44
+    type = JetTypeImpl@45['Ann']
+    valueArguments(ValueParameterDescriptorImpl@37['i']) = IntValue@46
 }

 LazyAnnotationDescriptor@47 {
-    _resolutionResults = OverloadResolutionResultsImpl@48
-    _type = JetTypeImpl@49['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@37['i']) = null
+    resolutionResults = OverloadResolutionResultsImpl@48
+    type = JetTypeImpl@49['Ann']
+    valueArguments(ValueParameterDescriptorImpl@37['i']) = null
 }

 LazyAnnotationDescriptor@50 {
-    _resolutionResults = OverloadResolutionResultsImpl@51
-    _type = JetTypeImpl@52['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@37['i']) = null
+    resolutionResults = OverloadResolutionResultsImpl@51
+    type = JetTypeImpl@52['Ann']
+    valueArguments(ValueParameterDescriptorImpl@37['i']) = null
 }

 LazyAnnotationDescriptor@53 {
-    _resolutionResults = OverloadResolutionResultsImpl@54
-    _type = JetTypeImpl@55['AnnIA']
-    _valueArguments(ValueParameterDescriptorImpl@56['ia']) = null
+    resolutionResults = OverloadResolutionResultsImpl@54
+    type = JetTypeImpl@55['AnnIA']
+    valueArguments(ValueParameterDescriptorImpl@56['ia']) = null
 }

 LazyAnnotationDescriptor@57 {
-    _resolutionResults = OverloadResolutionResultsImpl@58
-    _type = JetTypeImpl@59['AnnSA']
-    _valueArguments(ValueParameterDescriptorImpl@60['sa']) = null
+    resolutionResults = OverloadResolutionResultsImpl@58
+    type = JetTypeImpl@59['AnnSA']
+    valueArguments(ValueParameterDescriptorImpl@60['sa']) = null
 }

 LazyJavaPackageFragmentProvider@61 {
-    _packageFragments('<root>': FqName@62) = LazyJavaPackageFragment@63['<root>']
-    _packageFragments('Ann': FqName@64) = null
-    _packageFragments('Ann2': FqName@65) = null
-    _packageFragments('AnnIA': FqName@66) = null
-    _packageFragments('AnnSA': FqName@67) = null
-    _packageFragments('Array': FqName@68) = null
-    _packageFragments('Int': FqName@69) = null
-    _packageFragments('IntArray': FqName@70) = null
-    _packageFragments('MyClass': FqName@71) = null
-    _packageFragments('O': FqName@72) = null
-    _packageFragments('String': FqName@73) = null
-    _packageFragments('Test': FqName@74) = null
-    _packageFragments('i': FqName@75) = null
-    _packageFragments('i2': FqName@76) = null
-    _packageFragments('ia': FqName@77) = null
-    _packageFragments('java': FqName@78) = LazyJavaPackageFragment@79['java']
-    _packageFragments('java.lang': FqName@80) = LazyJavaPackageFragment@81['lang']
-    _packageFragments('java.lang.Ann': FqName@82) = null
-    _packageFragments('java.lang.AnnIA': FqName@83) = null
-    _packageFragments('java.lang.AnnSA': FqName@84) = null
-    _packageFragments('java.lang.Array': FqName@85) = null
-    _packageFragments('java.lang.Int': FqName@86) = null
-    _packageFragments('java.lang.IntArray': FqName@87) = null
-    _packageFragments('java.lang.O': FqName@88) = null
-    _packageFragments('java.lang.String': FqName@89) = null
-    _packageFragments('kotlin': FqName@90) = LazyJavaPackageFragment@91['kotlin']
-    _packageFragments('kotlin.Ann': FqName@92) = null
-    _packageFragments('kotlin.AnnIA': FqName@93) = null
-    _packageFragments('kotlin.AnnSA': FqName@94) = null
-    _packageFragments('kotlin.Array': FqName@95) = null
-    _packageFragments('kotlin.Int': FqName@96) = null
-    _packageFragments('kotlin.IntArray': FqName@97) = null
-    _packageFragments('kotlin.O': FqName@98) = null
-    _packageFragments('kotlin.String': FqName@99) = null
-    _packageFragments('kotlin.io': FqName@100) = LazyJavaPackageFragment@101['io']
-    _packageFragments('kotlin.io.Ann': FqName@102) = null
-    _packageFragments('kotlin.io.AnnIA': FqName@103) = null
-    _packageFragments('kotlin.io.AnnSA': FqName@104) = null
-    _packageFragments('kotlin.io.Array': FqName@105) = null
-    _packageFragments('kotlin.io.Int': FqName@106) = null
-    _packageFragments('kotlin.io.IntArray': FqName@107) = null
-    _packageFragments('kotlin.io.O': FqName@108) = null
-    _packageFragments('kotlin.io.String': FqName@109) = null
-    _packageFragments('kotlin.jvm': FqName@110) = LazyJavaPackageFragment@111['jvm']
-    _packageFragments('kotlin.jvm.Ann': FqName@112) = null
-    _packageFragments('kotlin.jvm.AnnIA': FqName@113) = null
-    _packageFragments('kotlin.jvm.AnnSA': FqName@114) = null
-    _packageFragments('kotlin.jvm.Array': FqName@115) = null
-    _packageFragments('kotlin.jvm.Int': FqName@116) = null
-    _packageFragments('kotlin.jvm.IntArray': FqName@117) = null
-    _packageFragments('kotlin.jvm.O': FqName@118) = null
-    _packageFragments('kotlin.jvm.String': FqName@119) = null
-    _packageFragments('kotlin.jvm.internal': FqName@120) = LazyJavaPackageFragment@13['internal']
-    _packageFragments('sa': FqName@121) = null
+    packageFragments('<root>': FqName@62) = LazyJavaPackageFragment@63['<root>']
+    packageFragments('Ann': FqName@64) = null
+    packageFragments('Ann2': FqName@65) = null
+    packageFragments('AnnIA': FqName@66) = null
+    packageFragments('AnnSA': FqName@67) = null
+    packageFragments('Array': FqName@68) = null
+    packageFragments('Int': FqName@69) = null
+    packageFragments('IntArray': FqName@70) = null
+    packageFragments('MyClass': FqName@71) = null
+    packageFragments('O': FqName@72) = null
+    packageFragments('String': FqName@73) = null
+    packageFragments('Test': FqName@74) = null
+    packageFragments('i': FqName@75) = null
+    packageFragments('i2': FqName@76) = null
+    packageFragments('ia': FqName@77) = null
+    packageFragments('java': FqName@78) = LazyJavaPackageFragment@79['java']
+    packageFragments('java.lang': FqName@80) = LazyJavaPackageFragment@81['lang']
+    packageFragments('java.lang.Ann': FqName@82) = null
+    packageFragments('java.lang.AnnIA': FqName@83) = null
+    packageFragments('java.lang.AnnSA': FqName@84) = null
+    packageFragments('java.lang.Array': FqName@85) = null
+    packageFragments('java.lang.Int': FqName@86) = null
+    packageFragments('java.lang.IntArray': FqName@87) = null
+    packageFragments('java.lang.O': FqName@88) = null
+    packageFragments('java.lang.String': FqName@89) = null
+    packageFragments('kotlin': FqName@90) = LazyJavaPackageFragment@91['kotlin']
+    packageFragments('kotlin.Ann': FqName@92) = null
+    packageFragments('kotlin.AnnIA': FqName@93) = null
+    packageFragments('kotlin.AnnSA': FqName@94) = null
+    packageFragments('kotlin.Array': FqName@95) = null
+    packageFragments('kotlin.Int': FqName@96) = null
+    packageFragments('kotlin.IntArray': FqName@97) = null
+    packageFragments('kotlin.O': FqName@98) = null
+    packageFragments('kotlin.String': FqName@99) = null
+    packageFragments('kotlin.io': FqName@100) = LazyJavaPackageFragment@101['io']
+    packageFragments('kotlin.io.Ann': FqName@102) = null
+    packageFragments('kotlin.io.AnnIA': FqName@103) = null
+    packageFragments('kotlin.io.AnnSA': FqName@104) = null
+    packageFragments('kotlin.io.Array': FqName@105) = null
+    packageFragments('kotlin.io.Int': FqName@106) = null
+    packageFragments('kotlin.io.IntArray': FqName@107) = null
+    packageFragments('kotlin.io.O': FqName@108) = null
+    packageFragments('kotlin.io.String': FqName@109) = null
+    packageFragments('kotlin.jvm': FqName@110) = LazyJavaPackageFragment@111['jvm']
+    packageFragments('kotlin.jvm.Ann': FqName@112) = null
+    packageFragments('kotlin.jvm.AnnIA': FqName@113) = null
+    packageFragments('kotlin.jvm.AnnSA': FqName@114) = null
+    packageFragments('kotlin.jvm.Array': FqName@115) = null
+    packageFragments('kotlin.jvm.Int': FqName@116) = null
+    packageFragments('kotlin.jvm.IntArray': FqName@117) = null
+    packageFragments('kotlin.jvm.O': FqName@118) = null
+    packageFragments('kotlin.jvm.String': FqName@119) = null
+    packageFragments('kotlin.jvm.internal': FqName@120) = LazyJavaPackageFragment@13['internal']
+    packageFragments('sa': FqName@121) = null
 }

 LazyJavaPackageFragment@63['<root>'] {
-    _functions('MyClass': Name@122) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('array': Name@125) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('foo': Name@126) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    _functions('intArray': Name@127) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('IntArray': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('MyClass': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('String': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('array': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('foo': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('i': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('i2': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('ia': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('intArray': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    classes('sa': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@124
-    deserializedPackageScope = Empty@136 // through LazyPackageFragmentScopeForJavaPackage@124
-    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@124
+    classes('Array': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('Int': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('IntArray': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('MyClass': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('String': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('foo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('i': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('i2': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('ia': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('intArray': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    classes('sa': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@123
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('MyClass': Name@126) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('array': Name@128) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('foo': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    functions('intArray': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@123
+    memberIndex = computeMemberIndex$1@137 // through LazyPackageFragmentScopeForJavaPackage@123
 }

 LazyJavaPackageFragment@13['internal'] {
@@ -191,126 +191,126 @@ LazyJavaPackageFragment@13['internal'] {
 }

 LazyJavaPackageFragment@101['io'] {
-    _functions('MyClass': Name@122) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    _functions('array': Name@125) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    _functions('foo': Name@126) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    _functions('intArray': Name@127) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('Array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('IntArray': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('MyClass': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('String': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('array': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('foo': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('i': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('i2': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('ia': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('intArray': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@140
-    classes('sa': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('Array': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('Int': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('IntArray': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('MyClass': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('String': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('foo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('i': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('i2': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('ia': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('intArray': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@140
+    classes('sa': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@140
    deserializedPackageScope = DeserializedPackageMemberScope@141 // through LazyPackageFragmentScopeForJavaPackage@140
-    functions('MyClass': Name@122) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    functions('array': Name@125) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    functions('foo': Name@126) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    functions('intArray': Name@127) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
+    functions('MyClass': Name@126) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    functions('MyClass': Name@126) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('array': Name@128) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    functions('array': Name@128) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('foo': Name@129) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    functions('foo': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
+    functions('intArray': Name@133) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    functions('intArray': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@140
    memberIndex = computeMemberIndex$1@142 // through LazyPackageFragmentScopeForJavaPackage@140
    membersProtos = HashMap@143 // through DeserializedPackageMemberScope@141
-    properties('MyClass': Name@122) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('O': Name@144) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('array': Name@125) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('foo': Name@126) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('i': Name@132) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('i2': Name@133) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('ia': Name@134) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('intArray': Name@127) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
-    properties('sa': Name@135) = EmptyList@123[empty] // through DeserializedPackageMemberScope@141
+    properties('MyClass': Name@126) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('O': Name@144) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('array': Name@128) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('foo': Name@129) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('i': Name@130) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('i2': Name@131) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('ia': Name@132) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('intArray': Name@133) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
+    properties('sa': Name@134) = EmptyList@136[empty] // through DeserializedPackageMemberScope@141
 }

 LazyJavaPackageFragment@79['java'] {
-    _functions('lang': Name@145) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@146
-    classes('lang': Name@147) = null // through LazyPackageFragmentScopeForJavaPackage@146
-    deserializedPackageScope = Empty@136 // through LazyPackageFragmentScopeForJavaPackage@146
+    classes('lang': Name@145) = null // through LazyPackageFragmentScopeForJavaPackage@146
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@146
+    functions('lang': Name@147) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@146
    memberIndex = computeMemberIndex$1@148 // through LazyPackageFragmentScopeForJavaPackage@146
 }

 LazyJavaPackageFragment@111['jvm'] {
-    _functions('MyClass': Name@122) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('array': Name@125) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('foo': Name@126) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    _functions('intArray': Name@127) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('IntArray': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('MyClass': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('String': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('array': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('foo': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('i': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('i2': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('ia': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('intArray': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    classes('sa': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@149
-    deserializedPackageScope = Empty@136 // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Array': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('Int': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('IntArray': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('MyClass': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('String': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('foo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('i': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('i2': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('ia': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('intArray': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    classes('sa': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@149
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('MyClass': Name@126) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('array': Name@128) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('foo': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@149
+    functions('intArray': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@149
    memberIndex = computeMemberIndex$1@150 // through LazyPackageFragmentScopeForJavaPackage@149
 }

 LazyJavaPackageFragment@91['kotlin'] {
-    _functions('MyClass': Name@122) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    _functions('array': Name@125) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    _functions('foo': Name@126) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    _functions('intArray': Name@127) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    _functions('io': Name@152) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    _functions('jvm': Name@153) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Any': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('Int': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('IntArray': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('MyClass': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('String': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('array': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('foo': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('i': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('i2': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('ia': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('intArray': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('io': Name@155) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('jvm': Name@156) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    classes('sa': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@151
-    deserializedPackageScope = DeserializedPackageMemberScope@157 // through LazyPackageFragmentScopeForJavaPackage@151
-    functions('MyClass': Name@122) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    functions('array': Name@125) = ArrayList@158[1] { DeserializedSimpleFunctionDescriptor@159['array'] } // through DeserializedPackageMemberScope@157
-    functions('foo': Name@126) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    functions('intArray': Name@127) = ArrayList@160[1] { DeserializedSimpleFunctionDescriptor@161['intArray'] } // through DeserializedPackageMemberScope@157
-    functions('io': Name@152) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    functions('jvm': Name@153) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@151
-    membersProtos = HashMap@163 // through DeserializedPackageMemberScope@157
-    properties('MyClass': Name@122) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('O': Name@144) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('array': Name@125) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('foo': Name@126) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('i': Name@132) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('i2': Name@133) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('ia': Name@134) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('intArray': Name@127) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('io': Name@152) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('jvm': Name@153) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
-    properties('sa': Name@135) = EmptyList@123[empty] // through DeserializedPackageMemberScope@157
+    classes('Any': Name@151) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('Array': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('Int': Name@124) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('IntArray': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('MyClass': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('String': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('foo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('i': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('i2': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('ia': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('intArray': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('io': Name@153) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('jvm': Name@154) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    classes('sa': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@152
+    deserializedPackageScope = DeserializedPackageMemberScope@155 // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('MyClass': Name@126) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    functions('MyClass': Name@126) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('array': Name@128) = ArrayList@156[1] { DeserializedSimpleFunctionDescriptor@157['array'] } // through DeserializedPackageMemberScope@155
+    functions('array': Name@128) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('foo': Name@129) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    functions('foo': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('intArray': Name@133) = ArrayList@158[1] { DeserializedSimpleFunctionDescriptor@159['intArray'] } // through DeserializedPackageMemberScope@155
+    functions('intArray': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('io': Name@160) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    functions('io': Name@160) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    functions('jvm': Name@161) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    functions('jvm': Name@161) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@152
+    memberIndex = computeMemberIndex$1@162 // through LazyPackageFragmentScopeForJavaPackage@152
+    membersProtos = HashMap@163 // through DeserializedPackageMemberScope@155
+    properties('MyClass': Name@126) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('O': Name@144) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('array': Name@128) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('foo': Name@129) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('i': Name@130) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('i2': Name@131) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('ia': Name@132) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('intArray': Name@133) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('io': Name@160) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('jvm': Name@161) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
+    properties('sa': Name@134) = EmptyList@136[empty] // through DeserializedPackageMemberScope@155
 }

 LazyJavaPackageFragment@81['lang'] {
-    _functions('MyClass': Name@122) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@164
-    _functions('array': Name@125) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@164
-    _functions('foo': Name@126) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@164
-    _functions('intArray': Name@127) = EmptyList@123[empty] // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('MyClass': Name@122) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('array': Name@125) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('foo': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('i': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('i2': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('ia': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('intArray': Name@127) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    classes('sa': Name@135) = null // through LazyPackageFragmentScopeForJavaPackage@164
-    deserializedPackageScope = Empty@136 // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('MyClass': Name@126) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('array': Name@128) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('foo': Name@129) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('i': Name@130) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('i2': Name@131) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('ia': Name@132) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('intArray': Name@133) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    classes('sa': Name@134) = null // through LazyPackageFragmentScopeForJavaPackage@164
+    deserializedPackageScope = Empty@135 // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('MyClass': Name@126) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('array': Name@128) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('foo': Name@129) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@164
+    functions('intArray': Name@133) = EmptyList@136[empty] // through LazyPackageFragmentScopeForJavaPackage@164
    memberIndex = computeMemberIndex$1@165 // through LazyPackageFragmentScopeForJavaPackage@164
 }

@@ -40,19 +40,19 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }

 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
-}
-
-DeserializedType@30['T in kotlin'] {
    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }

-DeserializedType@31['T in kotlin'] {
+DeserializedType@30['T in kotlin'] {
    constructor = AbstractLazyTypeParameterDescriptor$1@26
 }

+DeserializedType@31['T in kotlin'] {
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
+}
+
 DeserializedType@32['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }

 DeserializedType@33['java.lang.Class'] {
@@ -89,212 +89,212 @@ DeserializedType@45['kotlin.IntArray'] {
 }

 LazyAnnotationDescriptor@47 {
-    _resolutionResults = OverloadResolutionResultsImpl@48
-    _type = JetTypeImpl@49['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@51
+    resolutionResults = OverloadResolutionResultsImpl@48
+    type = JetTypeImpl@49['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@51
 }

 LazyAnnotationDescriptor@52 {
-    _resolutionResults = OverloadResolutionResultsImpl@53
-    _type = JetTypeImpl@54['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@55
+    resolutionResults = OverloadResolutionResultsImpl@53
+    type = JetTypeImpl@54['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@55
 }

 LazyAnnotationDescriptor@56 {
-    _resolutionResults = OverloadResolutionResultsImpl@57
-    _type = JetTypeImpl@58['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@59
+    resolutionResults = OverloadResolutionResultsImpl@57
+    type = JetTypeImpl@58['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@59
 }

 LazyAnnotationDescriptor@60 {
-    _resolutionResults = OverloadResolutionResultsImpl@61
-    _type = JetTypeImpl@62['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@63
+    resolutionResults = OverloadResolutionResultsImpl@61
+    type = JetTypeImpl@62['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@63
 }

 LazyAnnotationDescriptor@64 {
-    _resolutionResults = OverloadResolutionResultsImpl@65
-    _type = JetTypeImpl@66['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@67
+    resolutionResults = OverloadResolutionResultsImpl@65
+    type = JetTypeImpl@66['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@67
 }

 LazyAnnotationDescriptor@68 {
-    _resolutionResults = OverloadResolutionResultsImpl@69
-    _type = JetTypeImpl@70['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@71
+    resolutionResults = OverloadResolutionResultsImpl@69
+    type = JetTypeImpl@70['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@71
 }

 LazyAnnotationDescriptor@72 {
-    _resolutionResults = OverloadResolutionResultsImpl@73
-    _type = JetTypeImpl@74['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@75
+    resolutionResults = OverloadResolutionResultsImpl@73
+    type = JetTypeImpl@74['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@75
 }

 LazyAnnotationDescriptor@76 {
-    _resolutionResults = OverloadResolutionResultsImpl@77
-    _type = JetTypeImpl@78['Ann']
-    _valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@79
+    resolutionResults = OverloadResolutionResultsImpl@77
+    type = JetTypeImpl@78['Ann']
+    valueArguments(ValueParameterDescriptorImpl@50['i']) = ArrayValue@79
 }

 LazyAnnotationDescriptor@80 {
-    _resolutionResults = OverloadResolutionResultsImpl@81
-    _type = JetTypeImpl@82['AnnAnn']
-    _valueArguments(ValueParameterDescriptorImpl@83['i']) = ArrayValue@84
+    resolutionResults = OverloadResolutionResultsImpl@81
+    type = JetTypeImpl@82['AnnAnn']
+    valueArguments(ValueParameterDescriptorImpl@83['i']) = ArrayValue@84
 }

 LazyAnnotationDescriptor@85 {
-    _resolutionResults = OverloadResolutionResultsImpl@86
-    _type = JetTypeImpl@87['AnnAnn']
-    _valueArguments(ValueParameterDescriptorImpl@83['i']) = ArrayValue@88
+    resolutionResults = OverloadResolutionResultsImpl@86
+    type = JetTypeImpl@87['AnnAnn']
+    valueArguments(ValueParameterDescriptorImpl@83['i']) = ArrayValue@88
 }

 LazyAnnotationDescriptor@89 {
-    _resolutionResults = OverloadResolutionResultsImpl@90
-    _type = JetTypeImpl@91['AnnJC']
-    _valueArguments(ValueParameterDescriptorImpl@92['i']) = ArrayValue@93
+    resolutionResults = OverloadResolutionResultsImpl@90
+    type = JetTypeImpl@91['AnnJC']
+    valueArguments(ValueParameterDescriptorImpl@92['i']) = ArrayValue@93
 }

 LazyAnnotationDescriptor@94 {
-    _resolutionResults = OverloadResolutionResultsImpl@95
-    _type = JetTypeImpl@96['AnnJC']
-    _valueArguments(ValueParameterDescriptorImpl@92['i']) = ArrayValue@97
+    resolutionResults = OverloadResolutionResultsImpl@95
+    type = JetTypeImpl@96['AnnJC']
+    valueArguments(ValueParameterDescriptorImpl@92['i']) = ArrayValue@97
 }

 LazyJavaClassDescriptor@98['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@99['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@99['AnnotatedElement']
 }

 LazyJavaClassDescriptor@100['Class'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@34['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@34['Class']
 }

 LazyJavaClassDescriptor@101['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@102['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@102['GenericDeclaration']
 }

 LazyJavaClassDescriptor@103['Serializable'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@104['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@104['Serializable']
 }

 LazyJavaClassDescriptor@105['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@106['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@106['Type']
 }

 LazyJavaClassTypeConstructor@99['AnnotatedElement'] {
-    _supertypes = ArrayList@107[1] { JetTypeImpl@108['Any'] }
+    supertypes = ArrayList@107[1] { JetTypeImpl@108['Any'] }
 }

 LazyJavaClassTypeConstructor@34['Class'] {
-    _parameters = ArrayList@109[1] { LazyJavaTypeParameterDescriptor@110['T'] }
-    _supertypes = ArrayList@111[4] { LazyJavaClassifierType@112['Serializable'], LazyJavaClassifierType@113['GenericDeclaration'], LazyJavaClassifierType@114['Type'], ... }
+    parameters = ArrayList@109[1] { LazyJavaTypeParameterDescriptor@110['T'] }
+    supertypes = ArrayList@111[4] { LazyJavaClassifierType@112['Serializable'], LazyJavaClassifierType@113['GenericDeclaration'], LazyJavaClassifierType@114['Type'], ... }
 }

 LazyJavaClassTypeConstructor@102['GenericDeclaration'] {
-    _supertypes = ArrayList@115[1] { JetTypeImpl@108['Any'] }
+    supertypes = ArrayList@115[1] { JetTypeImpl@108['Any'] }
 }

 LazyJavaClassTypeConstructor@104['Serializable'] {
-    _parameters = ArrayList@116[empty]
-    _supertypes = ArrayList@117[1] { JetTypeImpl@108['Any'] }
+    parameters = ArrayList@116[empty]
+    supertypes = ArrayList@117[1] { JetTypeImpl@108['Any'] }
 }

 LazyJavaClassTypeConstructor@106['Type'] {
-    _supertypes = ArrayList@118[1] { JetTypeImpl@108['Any'] }
+    supertypes = ArrayList@118[1] { JetTypeImpl@108['Any'] }
 }

 LazyJavaClassifierType@119['AnnotatedElement'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@99['AnnotatedElement']
    classifier = JavaClassImpl@120['AnnotatedElement']
+    typeConstructor = LazyJavaClassTypeConstructor@99['AnnotatedElement']
 }

 LazyJavaClassifierType@113['GenericDeclaration'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@102['GenericDeclaration']
    classifier = JavaClassImpl@121['GenericDeclaration']
+    typeConstructor = LazyJavaClassTypeConstructor@102['GenericDeclaration']
 }

 LazyJavaClassifierType@122['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@123['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@124['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@125['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@126['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@127['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@128['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@129['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@130['Object'] {
-    _typeConstructor = DeserializedClassTypeConstructor@36
    classifier = JavaClassImpl@131['Object']
+    typeConstructor = DeserializedClassTypeConstructor@36
 }

 LazyJavaClassifierType@112['Serializable'] {
-    _arguments = ArrayList@132[empty]
-    _typeConstructor = LazyJavaClassTypeConstructor@104['Serializable']
+    arguments = ArrayList@132[empty]
    classifier = JavaClassImpl@133['Serializable']
+    typeConstructor = LazyJavaClassTypeConstructor@104['Serializable']
 }

 LazyJavaClassifierType@114['Type'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@106['Type']
    classifier = JavaClassImpl@134['Type']
+    typeConstructor = LazyJavaClassTypeConstructor@106['Type']
 }

 LazyJavaPackageFragmentProvider@135 {
-    _packageFragments('<root>': FqName@136) = LazyJavaPackageFragment@137['<root>']
-    _packageFragments('Ann': FqName@138) = null
-    _packageFragments('AnnAnn': FqName@139) = null
-    _packageFragments('AnnJC': FqName@140) = null
-    _packageFragments('Class': FqName@141) = null
-    _packageFragments('Int': FqName@142) = null
-    _packageFragments('Test': FqName@143) = null
-    _packageFragments('TestAnn': FqName@144) = null
-    _packageFragments('TestJC': FqName@145) = null
-    _packageFragments('i': FqName@146) = null
-    _packageFragments('i2': FqName@147) = null
-    _packageFragments('i3': FqName@148) = null
-    _packageFragments('iAnn': FqName@149) = null
-    _packageFragments('iJC': FqName@150) = null
-    _packageFragments('java': FqName@151) = LazyJavaPackageFragment@152['java']
-    _packageFragments('java.io': FqName@153) = LazyJavaPackageFragment@154['io']
-    _packageFragments('java.lang': FqName@155) = LazyJavaPackageFragment@156['lang']
-    _packageFragments('java.lang.Ann': FqName@157) = null
-    _packageFragments('java.lang.AnnAnn': FqName@158) = null
-    _packageFragments('java.lang.AnnJC': FqName@159) = null
-    _packageFragments('java.lang.Class': FqName@160) = null
-    _packageFragments('java.lang.Int': FqName@161) = null
-    _packageFragments('java.lang.Test': FqName@162) = null
-    _packageFragments('java.lang.reflect': FqName@163) = LazyJavaPackageFragment@164['reflect']
-    _packageFragments('kotlin': FqName@165) = LazyJavaPackageFragment@19['kotlin']
-    _packageFragments('kotlin.Ann': FqName@166) = null
-    _packageFragments('kotlin.AnnAnn': FqName@167) = null
-    _packageFragments('kotlin.AnnJC': FqName@168) = null
-    _packageFragments('kotlin.Class': FqName@169) = null
-    _packageFragments('kotlin.Int': FqName@170) = null
-    _packageFragments('kotlin.Test': FqName@171) = null
-    _packageFragments('kotlin.io': FqName@172) = LazyJavaPackageFragment@173['io']
-    _packageFragments('kotlin.io.Ann': FqName@174) = null
-    _packageFragments('kotlin.io.AnnAnn': FqName@175) = null
-    _packageFragments('kotlin.io.AnnJC': FqName@176) = null
-    _packageFragments('kotlin.io.Class': FqName@177) = null
-    _packageFragments('kotlin.io.Int': FqName@178) = null
-    _packageFragments('kotlin.io.Test': FqName@179) = null
-    _packageFragments('kotlin.jvm': FqName@180) = LazyJavaPackageFragment@181['jvm']
-    _packageFragments('kotlin.jvm.Ann': FqName@182) = null
-    _packageFragments('kotlin.jvm.AnnAnn': FqName@183) = null
-    _packageFragments('kotlin.jvm.AnnJC': FqName@184) = null
-    _packageFragments('kotlin.jvm.Class': FqName@185) = null
-    _packageFragments('kotlin.jvm.Int': FqName@186) = null
-    _packageFragments('kotlin.jvm.Test': FqName@187) = null
-    _packageFragments('kotlin.jvm.internal': FqName@188) = LazyJavaPackageFragment@16['internal']
+    packageFragments('<root>': FqName@136) = LazyJavaPackageFragment@137['<root>']
+    packageFragments('Ann': FqName@138) = null
+    packageFragments('AnnAnn': FqName@139) = null
+    packageFragments('AnnJC': FqName@140) = null
+    packageFragments('Class': FqName@141) = null
+    packageFragments('Int': FqName@142) = null
+    packageFragments('Test': FqName@143) = null
+    packageFragments('TestAnn': FqName@144) = null
+    packageFragments('TestJC': FqName@145) = null
+    packageFragments('i': FqName@146) = null
+    packageFragments('i2': FqName@147) = null
+    packageFragments('i3': FqName@148) = null
+    packageFragments('iAnn': FqName@149) = null
+    packageFragments('iJC': FqName@150) = null
+    packageFragments('java': FqName@151) = LazyJavaPackageFragment@152['java']
+    packageFragments('java.io': FqName@153) = LazyJavaPackageFragment@154['io']
+    packageFragments('java.lang': FqName@155) = LazyJavaPackageFragment@156['lang']
+    packageFragments('java.lang.Ann': FqName@157) = null
+    packageFragments('java.lang.AnnAnn': FqName@158) = null
+    packageFragments('java.lang.AnnJC': FqName@159) = null
+    packageFragments('java.lang.Class': FqName@160) = null
+    packageFragments('java.lang.Int': FqName@161) = null
+    packageFragments('java.lang.Test': FqName@162) = null
+    packageFragments('java.lang.reflect': FqName@163) = LazyJavaPackageFragment@164['reflect']
+    packageFragments('kotlin': FqName@165) = LazyJavaPackageFragment@19['kotlin']
+    packageFragments('kotlin.Ann': FqName@166) = null
+    packageFragments('kotlin.AnnAnn': FqName@167) = null
+    packageFragments('kotlin.AnnJC': FqName@168) = null
+    packageFragments('kotlin.Class': FqName@169) = null
+    packageFragments('kotlin.Int': FqName@170) = null
+    packageFragments('kotlin.Test': FqName@171) = null
+    packageFragments('kotlin.io': FqName@172) = LazyJavaPackageFragment@173['io']
+    packageFragments('kotlin.io.Ann': FqName@174) = null
+    packageFragments('kotlin.io.AnnAnn': FqName@175) = null
+    packageFragments('kotlin.io.AnnJC': FqName@176) = null
+    packageFragments('kotlin.io.Class': FqName@177) = null
+    packageFragments('kotlin.io.Int': FqName@178) = null
+    packageFragments('kotlin.io.Test': FqName@179) = null
+    packageFragments('kotlin.jvm': FqName@180) = LazyJavaPackageFragment@181['jvm']
+    packageFragments('kotlin.jvm.Ann': FqName@182) = null
+    packageFragments('kotlin.jvm.AnnAnn': FqName@183) = null
+    packageFragments('kotlin.jvm.AnnJC': FqName@184) = null
+    packageFragments('kotlin.jvm.Class': FqName@185) = null
+    packageFragments('kotlin.jvm.Int': FqName@186) = null
+    packageFragments('kotlin.jvm.Test': FqName@187) = null
+    packageFragments('kotlin.jvm.internal': FqName@188) = LazyJavaPackageFragment@16['internal']
    topLevelClasses(JavaClassImpl@120['AnnotatedElement']) = LazyJavaClassDescriptor@98['AnnotatedElement']
    topLevelClasses(JavaClassImpl@189['Class']) = LazyJavaClassDescriptor@100['Class']
    topLevelClasses(JavaClassImpl@121['GenericDeclaration']) = LazyJavaClassDescriptor@101['GenericDeclaration']
@@ -303,25 +303,25 @@ LazyJavaPackageFragmentProvider@135 {
 }

 LazyJavaPackageFragment@137['<root>'] {
-    _functions('Ann': Name@190) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    _functions('array': Name@193) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    _functions('foo': Name@194) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    _functions('intArray': Name@195) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    _functions('javaClass': Name@196) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('Class': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('Int': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('array': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('foo': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('intArray': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    classes('javaClass': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@192
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@192
-    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@192
+    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@191
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@191
+    memberIndex = computeMemberIndex$1@205 // through LazyPackageFragmentScopeForJavaPackage@191
 }

 LazyJavaPackageFragment@16['internal'] {
@@ -329,140 +329,140 @@ LazyJavaPackageFragment@16['internal'] {
 }

 LazyJavaPackageFragment@173['io'] {
-    _functions('Ann': Name@190) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('array': Name@193) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('foo': Name@194) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('intArray': Name@195) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@208
-    _functions('javaClass': Name@196) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@208
    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Class': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('Int': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('array': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('foo': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('intArray': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@208
-    classes('javaClass': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@208
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@208
    deserializedPackageScope = DeserializedPackageMemberScope@209 // through LazyPackageFragmentScopeForJavaPackage@208
-    functions('Ann': Name@190) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    functions('array': Name@193) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    functions('foo': Name@194) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    functions('intArray': Name@195) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    functions('javaClass': Name@196) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
+    functions('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@208
    memberIndex = computeMemberIndex$1@210 // through LazyPackageFragmentScopeForJavaPackage@208
    membersProtos = HashMap@211 // through DeserializedPackageMemberScope@209
-    properties('Ann': Name@190) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('array': Name@193) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('foo': Name@194) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('i': Name@199) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('i2': Name@200) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('i3': Name@201) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('iAnn': Name@202) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('iJC': Name@203) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('intArray': Name@195) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
-    properties('javaClass': Name@196) = EmptyList@191[empty] // through DeserializedPackageMemberScope@209
+    properties('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
+    properties('javaClass': Name@202) = EmptyList@204[empty] // through DeserializedPackageMemberScope@209
 }

 LazyJavaPackageFragment@152['java'] {
-    _functions('lang': Name@212) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@213
-    classes('lang': Name@214) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@213
+    classes('lang': Name@212) = null // through LazyPackageFragmentScopeForJavaPackage@213
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@213
+    functions('lang': Name@214) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@213
    memberIndex = computeMemberIndex$1@215 // through LazyPackageFragmentScopeForJavaPackage@213
 }

 LazyJavaPackageFragment@181['jvm'] {
-    _functions('Ann': Name@190) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('array': Name@193) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('foo': Name@194) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('intArray': Name@195) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@216
-    _functions('javaClass': Name@196) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@216
    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Class': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('Int': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('array': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('foo': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('intArray': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    classes('javaClass': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@216
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@216
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@216
    memberIndex = computeMemberIndex$1@217 // through LazyPackageFragmentScopeForJavaPackage@216
 }

 LazyJavaPackageFragment@19['kotlin'] {
-    _functions('Ann': Name@190) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('array': Name@193) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('foo': Name@194) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('intArray': Name@195) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('io': Name@219) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('javaClass': Name@196) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@218
-    _functions('jvm': Name@220) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@218
    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Any': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Array': Name@222) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Class': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('Int': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('IntArray': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('array': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('foo': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('inline': Name@224) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('intArray': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('io': Name@225) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('javaClass': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    classes('jvm': Name@226) = null // through LazyPackageFragmentScopeForJavaPackage@218
-    deserializedPackageScope = DeserializedPackageMemberScope@227 // through LazyPackageFragmentScopeForJavaPackage@218
-    functions('Ann': Name@190) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    functions('array': Name@193) = ArrayList@228[1] { DeserializedSimpleFunctionDescriptor@229['array'] } // through DeserializedPackageMemberScope@227
-    functions('foo': Name@194) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    functions('intArray': Name@195) = ArrayList@230[1] { DeserializedSimpleFunctionDescriptor@231['intArray'] } // through DeserializedPackageMemberScope@227
-    functions('io': Name@219) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    functions('javaClass': Name@196) = ArrayList@232[1] { DeserializedSimpleFunctionDescriptor@233['javaClass'] } // through DeserializedPackageMemberScope@227
-    functions('jvm': Name@220) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
+    classes('Any': Name@219) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('Array': Name@220) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('Class': Name@192) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('Int': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('IntArray': Name@221) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('inline': Name@222) = DeserializedClassDescriptor@4['inline'] // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('io': Name@223) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    classes('jvm': Name@224) = null // through LazyPackageFragmentScopeForJavaPackage@218
+    deserializedPackageScope = DeserializedPackageMemberScope@225 // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('array': Name@194) = ArrayList@226[1] { DeserializedSimpleFunctionDescriptor@227['array'] } // through DeserializedPackageMemberScope@225
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('intArray': Name@201) = ArrayList@228[1] { DeserializedSimpleFunctionDescriptor@229['intArray'] } // through DeserializedPackageMemberScope@225
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('io': Name@230) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    functions('io': Name@230) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('javaClass': Name@202) = ArrayList@231[1] { DeserializedSimpleFunctionDescriptor@232['javaClass'] } // through DeserializedPackageMemberScope@225
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
+    functions('jvm': Name@233) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    functions('jvm': Name@233) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@218
    memberIndex = computeMemberIndex$1@234 // through LazyPackageFragmentScopeForJavaPackage@218
-    membersProtos = HashMap@235 // through DeserializedPackageMemberScope@227
-    properties('Ann': Name@190) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('array': Name@193) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('foo': Name@194) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('i': Name@199) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('i2': Name@200) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('i3': Name@201) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('iAnn': Name@202) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('iJC': Name@203) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('intArray': Name@195) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('io': Name@219) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
-    properties('javaClass': Name@196) = ArrayList@236[1] { DeserializedPropertyDescriptor@237['javaClass'] } // through DeserializedPackageMemberScope@227
-    properties('jvm': Name@220) = EmptyList@191[empty] // through DeserializedPackageMemberScope@227
+    membersProtos = HashMap@235 // through DeserializedPackageMemberScope@225
+    properties('Ann': Name@190) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('array': Name@194) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('foo': Name@195) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('i': Name@196) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('i2': Name@197) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('i3': Name@198) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('iAnn': Name@199) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('iJC': Name@200) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('intArray': Name@201) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('io': Name@230) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
+    properties('javaClass': Name@202) = ArrayList@236[1] { DeserializedPropertyDescriptor@237['javaClass'] } // through DeserializedPackageMemberScope@225
+    properties('jvm': Name@233) = EmptyList@204[empty] // through DeserializedPackageMemberScope@225
 }

 LazyJavaPackageFragment@156['lang'] {
-    _functions('Ann': Name@190) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    _functions('array': Name@193) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    _functions('foo': Name@194) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    _functions('intArray': Name@195) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@238
-    _functions('javaClass': Name@196) = EmptyList@191[empty] // through LazyPackageFragmentScopeForJavaPackage@238
    classes('Ann': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('Class': Name@197) = LazyJavaClassDescriptor@100['Class'] // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('array': Name@193) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('foo': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('i': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('i2': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('i3': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('iAnn': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('iJC': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('intArray': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    classes('javaClass': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@238
-    deserializedPackageScope = Empty@204 // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('Class': Name@192) = LazyJavaClassDescriptor@100['Class'] // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('foo': Name@195) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('i': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('i2': Name@197) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('i3': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('iAnn': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('iJC': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('intArray': Name@201) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    classes('javaClass': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@238
+    deserializedPackageScope = Empty@203 // through LazyPackageFragmentScopeForJavaPackage@238
+    functions('Ann': Name@190) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
+    functions('array': Name@194) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
+    functions('foo': Name@195) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
+    functions('intArray': Name@201) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
+    functions('javaClass': Name@202) = EmptyList@204[empty] // through LazyPackageFragmentScopeForJavaPackage@238
    memberIndex = computeMemberIndex$1@239 // through LazyPackageFragmentScopeForJavaPackage@238
 }

@@ -16,99 +16,99 @@ DeserializedClassDescriptor@2['platformStatic'] {
 }

 LazyAnnotationDescriptor@9 {
-    _resolutionResults = OverloadResolutionResultsImpl@10
-    _type = JetTypeImpl@11['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@10
+    type = JetTypeImpl@11['platformStatic']
 }

 LazyAnnotationDescriptor@12 {
-    _resolutionResults = OverloadResolutionResultsImpl@13
-    _type = JetTypeImpl@14['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@13
+    type = JetTypeImpl@14['platformStatic']
 }

 LazyAnnotationDescriptor@15 {
-    _resolutionResults = OverloadResolutionResultsImpl@16
-    _type = JetTypeImpl@17['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@16
+    type = JetTypeImpl@17['platformStatic']
 }

 LazyAnnotationDescriptor@18 {
-    _resolutionResults = OverloadResolutionResultsImpl@19
-    _type = JetTypeImpl@20['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@19
+    type = JetTypeImpl@20['platformStatic']
 }

 LazyAnnotationDescriptor@21 {
-    _resolutionResults = OverloadResolutionResultsImpl@22
-    _type = JetTypeImpl@23['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@22
+    type = JetTypeImpl@23['platformStatic']
 }

 LazyAnnotationDescriptor@24 {
-    _resolutionResults = OverloadResolutionResultsImpl@25
-    _type = JetTypeImpl@26['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@25
+    type = JetTypeImpl@26['platformStatic']
 }

 LazyAnnotationDescriptor@27 {
-    _resolutionResults = OverloadResolutionResultsImpl@28
-    _type = JetTypeImpl@29['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@28
+    type = JetTypeImpl@29['platformStatic']
 }

 LazyAnnotationDescriptor@30 {
-    _resolutionResults = OverloadResolutionResultsImpl@31
-    _type = JetTypeImpl@32['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@31
+    type = JetTypeImpl@32['platformStatic']
 }

 LazyJavaPackageFragmentProvider@33 {
-    _packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
-    _packageFragments('A': FqName@36) = null
-    _packageFragments('B': FqName@37) = null
-    _packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
-    _packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
-    _packageFragments('java.lang.platformStatic': FqName@42) = null
-    _packageFragments('kotlin': FqName@43) = LazyJavaPackageFragment@44['kotlin']
-    _packageFragments('kotlin.io': FqName@45) = LazyJavaPackageFragment@46['io']
-    _packageFragments('kotlin.io.platformStatic': FqName@47) = null
-    _packageFragments('kotlin.jvm': FqName@48) = LazyJavaPackageFragment@49['jvm']
-    _packageFragments('kotlin.jvm.platformStatic': FqName@50) = null
-    _packageFragments('kotlin.platform': FqName@51) = LazyJavaPackageFragment@7['platform']
-    _packageFragments('kotlin.platform.platformStatic': FqName@52) = null
-    _packageFragments('kotlin.platformStatic': FqName@53) = null
-    _packageFragments('platformStatic': FqName@54) = null
+    packageFragments('<root>': FqName@34) = LazyJavaPackageFragment@35['<root>']
+    packageFragments('A': FqName@36) = null
+    packageFragments('B': FqName@37) = null
+    packageFragments('java': FqName@38) = LazyJavaPackageFragment@39['java']
+    packageFragments('java.lang': FqName@40) = LazyJavaPackageFragment@41['lang']
+    packageFragments('java.lang.platformStatic': FqName@42) = null
+    packageFragments('kotlin': FqName@43) = LazyJavaPackageFragment@44['kotlin']
+    packageFragments('kotlin.io': FqName@45) = LazyJavaPackageFragment@46['io']
+    packageFragments('kotlin.io.platformStatic': FqName@47) = null
+    packageFragments('kotlin.jvm': FqName@48) = LazyJavaPackageFragment@49['jvm']
+    packageFragments('kotlin.jvm.platformStatic': FqName@50) = null
+    packageFragments('kotlin.platform': FqName@51) = LazyJavaPackageFragment@7['platform']
+    packageFragments('kotlin.platform.platformStatic': FqName@52) = null
+    packageFragments('kotlin.platformStatic': FqName@53) = null
+    packageFragments('platformStatic': FqName@54) = null
 }

 LazyJavaPackageFragment@35['<root>'] {
-    _functions('kotlin': Name@55) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('kotlin': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    classes('platformStatic': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@57
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@57
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@57
+    classes('kotlin': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('platformStatic': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
+    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@56
+    functions('kotlin': Name@59) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@56
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@56
 }

 LazyJavaPackageFragment@39['java'] {
-    _functions('lang': Name@62) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@63
-    classes('lang': Name@64) = null // through LazyPackageFragmentScopeForJavaPackage@63
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@63
+    classes('lang': Name@62) = null // 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@44['kotlin'] {
-    _functions('io': Name@66) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    _functions('jvm': Name@68) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    _functions('platform': Name@69) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('io': Name@70) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('jvm': Name@71) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    classes('platform': Name@72) = null // through LazyPackageFragmentScopeForJavaPackage@67
-    deserializedPackageScope = DeserializedPackageMemberScope@73 // through LazyPackageFragmentScopeForJavaPackage@67
-    functions('io': Name@66) = EmptyList@56[empty] // through DeserializedPackageMemberScope@73
-    functions('jvm': Name@68) = EmptyList@56[empty] // through DeserializedPackageMemberScope@73
-    functions('platform': Name@69) = EmptyList@56[empty] // through DeserializedPackageMemberScope@73
+    classes('io': Name@66) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('jvm': Name@68) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    classes('platform': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@67
+    deserializedPackageScope = DeserializedPackageMemberScope@70 // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('io': Name@71) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
+    functions('io': Name@71) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('jvm': Name@72) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
+    functions('jvm': Name@72) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
+    functions('platform': Name@73) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
+    functions('platform': Name@73) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@67
    memberIndex = computeMemberIndex$1@74 // through LazyPackageFragmentScopeForJavaPackage@67
-    membersProtos = HashMap@75 // through DeserializedPackageMemberScope@73
-    properties('io': Name@66) = EmptyList@56[empty] // through DeserializedPackageMemberScope@73
-    properties('jvm': Name@68) = EmptyList@56[empty] // through DeserializedPackageMemberScope@73
-    properties('platform': Name@69) = EmptyList@56[empty] // through DeserializedPackageMemberScope@73
+    membersProtos = HashMap@75 // through DeserializedPackageMemberScope@70
+    properties('io': Name@71) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
+    properties('jvm': Name@72) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
+    properties('platform': Name@73) = EmptyList@60[empty] // through DeserializedPackageMemberScope@70
 }

 LazyJavaPackageFragment@7['platform'] {
-    _functions('platformStatic': Name@76) = EmptyList@56[empty] // through LazyPackageFragmentScopeForJavaPackage@77
-    classes('platformStatic': Name@78) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@77
-    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@77
+    classes('platformStatic': Name@76) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@77
+    deserializedPackageScope = Empty@58 // through LazyPackageFragmentScopeForJavaPackage@77
+    functions('platformStatic': Name@78) = EmptyList@60[empty] // through LazyPackageFragmentScopeForJavaPackage@77
    memberIndex = computeMemberIndex$1@79 // through LazyPackageFragmentScopeForJavaPackage@77
 }
@@ -8,86 +8,86 @@ DeserializedClassDescriptor@2['platformStatic'] {
 }

 LazyAnnotationDescriptor@5 {
-    _resolutionResults = OverloadResolutionResultsImpl@6
-    _type = JetTypeImpl@7['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@6
+    type = JetTypeImpl@7['platformStatic']
 }

 LazyJavaPackageFragmentProvider@8 {
-    _packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
-    _packageFragments('Array': FqName@11) = null
-    _packageFragments('String': FqName@12) = null
-    _packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
-    _packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
-    _packageFragments('java.lang.Array': FqName@17) = null
-    _packageFragments('java.lang.String': FqName@18) = null
-    _packageFragments('java.lang.platformStatic': FqName@19) = null
-    _packageFragments('kotlin': FqName@20) = LazyJavaPackageFragment@21['kotlin']
-    _packageFragments('kotlin.Array': FqName@22) = null
-    _packageFragments('kotlin.String': FqName@23) = null
-    _packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
-    _packageFragments('kotlin.io.Array': FqName@26) = null
-    _packageFragments('kotlin.io.String': FqName@27) = null
-    _packageFragments('kotlin.io.platformStatic': FqName@28) = null
-    _packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
-    _packageFragments('kotlin.jvm.Array': FqName@31) = null
-    _packageFragments('kotlin.jvm.String': FqName@32) = null
-    _packageFragments('kotlin.jvm.platformStatic': FqName@33) = null
-    _packageFragments('kotlin.platform': FqName@34) = LazyJavaPackageFragment@3['platform']
-    _packageFragments('kotlin.platform.platformStatic': FqName@35) = null
-    _packageFragments('kotlin.platformStatic': FqName@36) = null
-    _packageFragments('platformStatic': FqName@37) = null
+    packageFragments('<root>': FqName@9) = LazyJavaPackageFragment@10['<root>']
+    packageFragments('Array': FqName@11) = null
+    packageFragments('String': FqName@12) = null
+    packageFragments('java': FqName@13) = LazyJavaPackageFragment@14['java']
+    packageFragments('java.lang': FqName@15) = LazyJavaPackageFragment@16['lang']
+    packageFragments('java.lang.Array': FqName@17) = null
+    packageFragments('java.lang.String': FqName@18) = null
+    packageFragments('java.lang.platformStatic': FqName@19) = null
+    packageFragments('kotlin': FqName@20) = LazyJavaPackageFragment@21['kotlin']
+    packageFragments('kotlin.Array': FqName@22) = null
+    packageFragments('kotlin.String': FqName@23) = null
+    packageFragments('kotlin.io': FqName@24) = LazyJavaPackageFragment@25['io']
+    packageFragments('kotlin.io.Array': FqName@26) = null
+    packageFragments('kotlin.io.String': FqName@27) = null
+    packageFragments('kotlin.io.platformStatic': FqName@28) = null
+    packageFragments('kotlin.jvm': FqName@29) = LazyJavaPackageFragment@30['jvm']
+    packageFragments('kotlin.jvm.Array': FqName@31) = null
+    packageFragments('kotlin.jvm.String': FqName@32) = null
+    packageFragments('kotlin.jvm.platformStatic': FqName@33) = null
+    packageFragments('kotlin.platform': FqName@34) = LazyJavaPackageFragment@3['platform']
+    packageFragments('kotlin.platform.platformStatic': FqName@35) = null
+    packageFragments('kotlin.platformStatic': FqName@36) = null
+    packageFragments('platformStatic': FqName@37) = null
 }

 LazyJavaPackageFragment@10['<root>'] {
-    _functions('kotlin': Name@38) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('kotlin': Name@43) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    classes('platformStatic': Name@44) = null // through LazyPackageFragmentScopeForJavaPackage@40
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@40
-    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@40
+    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('kotlin': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    classes('platformStatic': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@39
+    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@39
+    functions('kotlin': Name@44) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@39
+    memberIndex = computeMemberIndex$1@46 // through LazyPackageFragmentScopeForJavaPackage@39
 }

 LazyJavaPackageFragment@25['io'] {
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@47
-    classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@47
+    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@47
 }

 LazyJavaPackageFragment@14['java'] {
-    _functions('lang': Name@48) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@49
-    classes('lang': Name@50) = null // through LazyPackageFragmentScopeForJavaPackage@49
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@49
+    classes('lang': Name@48) = null // through LazyPackageFragmentScopeForJavaPackage@49
+    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@49
+    functions('lang': Name@50) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@49
    memberIndex = computeMemberIndex$1@51 // through LazyPackageFragmentScopeForJavaPackage@49
 }

 LazyJavaPackageFragment@30['jvm'] {
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@52
-    classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@52
+    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@52
 }

 LazyJavaPackageFragment@21['kotlin'] {
-    _functions('io': Name@53) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    _functions('jvm': Name@55) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    _functions('platform': Name@56) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('Array': Name@41) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('String': Name@42) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('io': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('jvm': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    classes('platform': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@54
-    deserializedPackageScope = DeserializedPackageMemberScope@60 // through LazyPackageFragmentScopeForJavaPackage@54
-    functions('io': Name@53) = EmptyList@39[empty] // through DeserializedPackageMemberScope@60
-    functions('jvm': Name@55) = EmptyList@39[empty] // through DeserializedPackageMemberScope@60
-    functions('platform': Name@56) = EmptyList@39[empty] // through DeserializedPackageMemberScope@60
-    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@54
-    membersProtos = HashMap@62 // through DeserializedPackageMemberScope@60
-    properties('io': Name@53) = EmptyList@39[empty] // through DeserializedPackageMemberScope@60
-    properties('jvm': Name@55) = EmptyList@39[empty] // through DeserializedPackageMemberScope@60
-    properties('platform': Name@56) = EmptyList@39[empty] // through DeserializedPackageMemberScope@60
+    classes('Array': Name@38) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('String': Name@40) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('io': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('jvm': Name@55) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    classes('platform': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@53
+    deserializedPackageScope = DeserializedPackageMemberScope@57 // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    functions('io': Name@58) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    functions('jvm': Name@59) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    functions('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    functions('platform': Name@60) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@53
+    memberIndex = computeMemberIndex$1@61 // through LazyPackageFragmentScopeForJavaPackage@53
+    membersProtos = HashMap@62 // through DeserializedPackageMemberScope@57
+    properties('io': Name@58) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    properties('jvm': Name@59) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
+    properties('platform': Name@60) = EmptyList@45[empty] // through DeserializedPackageMemberScope@57
 }

 LazyJavaPackageFragment@3['platform'] {
-    _functions('platformStatic': Name@63) = EmptyList@39[empty] // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('platformStatic': Name@65) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@64
-    deserializedPackageScope = Empty@45 // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('platformStatic': Name@63) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@64
+    deserializedPackageScope = Empty@43 // through LazyPackageFragmentScopeForJavaPackage@64
+    functions('platformStatic': Name@65) = EmptyList@45[empty] // through LazyPackageFragmentScopeForJavaPackage@64
    memberIndex = computeMemberIndex$1@66 // through LazyPackageFragmentScopeForJavaPackage@64
 }
@@ -17,124 +17,124 @@ DeserializedClassDescriptor@2['platformStatic'] {
 }

 LazyAnnotationDescriptor@10 {
-    _resolutionResults = OverloadResolutionResultsImpl@11
-    _type = JetTypeImpl@12['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@11
+    type = JetTypeImpl@12['platformStatic']
 }

 LazyAnnotationDescriptor@13 {
-    _resolutionResults = OverloadResolutionResultsImpl@14
-    _type = JetTypeImpl@15['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@14
+    type = JetTypeImpl@15['platformStatic']
 }

 LazyAnnotationDescriptor@16 {
-    _resolutionResults = OverloadResolutionResultsImpl@17
-    _type = JetTypeImpl@18['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@17
+    type = JetTypeImpl@18['platformStatic']
 }

 LazyAnnotationDescriptor@19 {
-    _resolutionResults = OverloadResolutionResultsImpl@20
-    _type = JetTypeImpl@21['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@20
+    type = JetTypeImpl@21['platformStatic']
 }

 LazyAnnotationDescriptor@22 {
-    _resolutionResults = OverloadResolutionResultsImpl@23
-    _type = JetTypeImpl@24['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@23
+    type = JetTypeImpl@24['platformStatic']
 }

 LazyAnnotationDescriptor@25 {
-    _resolutionResults = OverloadResolutionResultsImpl@26
-    _type = JetTypeImpl@27['platformStatic']
+    resolutionResults = OverloadResolutionResultsImpl@26
+    type = JetTypeImpl@27['platformStatic']
 }

 LazyJavaPackageFragmentProvider@28 {
-    _packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
-    _packageFragments('A': FqName@31) = null
-    _packageFragments('Int': FqName@32) = null
-    _packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
-    _packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
-    _packageFragments('java.lang.Int': FqName@37) = null
-    _packageFragments('java.lang.platformStatic': FqName@38) = null
-    _packageFragments('kotlin': FqName@39) = LazyJavaPackageFragment@40['kotlin']
-    _packageFragments('kotlin.Int': FqName@41) = null
-    _packageFragments('kotlin.io': FqName@42) = LazyJavaPackageFragment@43['io']
-    _packageFragments('kotlin.io.Int': FqName@44) = null
-    _packageFragments('kotlin.io.platformStatic': FqName@45) = null
-    _packageFragments('kotlin.jvm': FqName@46) = LazyJavaPackageFragment@47['jvm']
-    _packageFragments('kotlin.jvm.Int': FqName@48) = null
-    _packageFragments('kotlin.jvm.platformStatic': FqName@49) = null
-    _packageFragments('kotlin.platform': FqName@50) = LazyJavaPackageFragment@8['platform']
-    _packageFragments('kotlin.platform.platformStatic': FqName@51) = null
-    _packageFragments('kotlin.platformStatic': FqName@52) = null
-    _packageFragments('platformStatic': FqName@53) = null
+    packageFragments('<root>': FqName@29) = LazyJavaPackageFragment@30['<root>']
+    packageFragments('A': FqName@31) = null
+    packageFragments('Int': FqName@32) = null
+    packageFragments('java': FqName@33) = LazyJavaPackageFragment@34['java']
+    packageFragments('java.lang': FqName@35) = LazyJavaPackageFragment@36['lang']
+    packageFragments('java.lang.Int': FqName@37) = null
+    packageFragments('java.lang.platformStatic': FqName@38) = null
+    packageFragments('kotlin': FqName@39) = LazyJavaPackageFragment@40['kotlin']
+    packageFragments('kotlin.Int': FqName@41) = null
+    packageFragments('kotlin.io': FqName@42) = LazyJavaPackageFragment@43['io']
+    packageFragments('kotlin.io.Int': FqName@44) = null
+    packageFragments('kotlin.io.platformStatic': FqName@45) = null
+    packageFragments('kotlin.jvm': FqName@46) = LazyJavaPackageFragment@47['jvm']
+    packageFragments('kotlin.jvm.Int': FqName@48) = null
+    packageFragments('kotlin.jvm.platformStatic': FqName@49) = null
+    packageFragments('kotlin.platform': FqName@50) = LazyJavaPackageFragment@8['platform']
+    packageFragments('kotlin.platform.platformStatic': FqName@51) = null
+    packageFragments('kotlin.platformStatic': FqName@52) = null
+    packageFragments('platformStatic': FqName@53) = null
 }

 LazyJavaPackageFragment@30['<root>'] {
-    _functions('kotlin': Name@54) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('kotlin': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('p': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('p1': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    classes('platformStatic': Name@61) = null // through LazyPackageFragmentScopeForJavaPackage@56
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@56
-    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@56
+    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('kotlin': Name@56) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('p1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    classes('platformStatic': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@55
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@55
+    functions('kotlin': Name@61) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@55
+    memberIndex = computeMemberIndex$1@63 // through LazyPackageFragmentScopeForJavaPackage@55
 }

 LazyJavaPackageFragment@43['io'] {
-    classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@64
-    classes('p1': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@64
+    classes('p1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@64
    deserializedPackageScope = DeserializedPackageMemberScope@65 // through LazyPackageFragmentScopeForJavaPackage@64
    membersProtos = HashMap@66 // through DeserializedPackageMemberScope@65
-    properties('p': Name@59) = EmptyList@55[empty] // through DeserializedPackageMemberScope@65
-    properties('p1': Name@60) = EmptyList@55[empty] // through DeserializedPackageMemberScope@65
+    properties('p': Name@57) = EmptyList@62[empty] // through DeserializedPackageMemberScope@65
+    properties('p1': Name@58) = EmptyList@62[empty] // through DeserializedPackageMemberScope@65
 }

 LazyJavaPackageFragment@34['java'] {
-    _functions('lang': Name@67) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@68
-    classes('lang': Name@69) = null // through LazyPackageFragmentScopeForJavaPackage@68
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@68
+    classes('lang': Name@67) = null // through LazyPackageFragmentScopeForJavaPackage@68
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@68
+    functions('lang': Name@69) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@68
    memberIndex = computeMemberIndex$1@70 // through LazyPackageFragmentScopeForJavaPackage@68
 }

 LazyJavaPackageFragment@47['jvm'] {
-    classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('p': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    classes('p1': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@71
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    classes('p1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@71
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@71
 }

 LazyJavaPackageFragment@40['kotlin'] {
-    _functions('io': Name@72) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    _functions('jvm': Name@74) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    _functions('platform': Name@75) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('Int': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('io': Name@76) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('jvm': Name@77) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('p1': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    classes('platform': Name@78) = null // through LazyPackageFragmentScopeForJavaPackage@73
-    deserializedPackageScope = DeserializedPackageMemberScope@79 // through LazyPackageFragmentScopeForJavaPackage@73
-    functions('io': Name@72) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
-    functions('jvm': Name@74) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
-    functions('platform': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
-    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@73
-    membersProtos = HashMap@81 // through DeserializedPackageMemberScope@79
-    properties('io': Name@72) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
-    properties('jvm': Name@74) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
-    properties('p': Name@59) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
-    properties('p1': Name@60) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
-    properties('platform': Name@75) = EmptyList@55[empty] // through DeserializedPackageMemberScope@79
+    classes('Int': Name@54) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('io': Name@73) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('jvm': Name@74) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('p1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    classes('platform': Name@75) = null // through LazyPackageFragmentScopeForJavaPackage@72
+    deserializedPackageScope = DeserializedPackageMemberScope@76 // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('io': Name@77) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
+    functions('io': Name@77) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('jvm': Name@78) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
+    functions('jvm': Name@78) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    functions('platform': Name@79) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
+    functions('platform': Name@79) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@72
+    memberIndex = computeMemberIndex$1@80 // through LazyPackageFragmentScopeForJavaPackage@72
+    membersProtos = HashMap@81 // through DeserializedPackageMemberScope@76
+    properties('io': Name@77) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
+    properties('jvm': Name@78) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
+    properties('p': Name@57) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
+    properties('p1': Name@58) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
+    properties('platform': Name@79) = EmptyList@62[empty] // through DeserializedPackageMemberScope@76
 }

 LazyJavaPackageFragment@36['lang'] {
-    classes('p': Name@59) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    classes('p1': Name@60) = null // through LazyPackageFragmentScopeForJavaPackage@82
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('p': Name@57) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    classes('p1': Name@58) = null // through LazyPackageFragmentScopeForJavaPackage@82
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@82
 }

 LazyJavaPackageFragment@8['platform'] {
-    _functions('platformStatic': Name@83) = EmptyList@55[empty] // through LazyPackageFragmentScopeForJavaPackage@84
-    classes('platformStatic': Name@85) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@84
-    deserializedPackageScope = Empty@62 // through LazyPackageFragmentScopeForJavaPackage@84
+    classes('platformStatic': Name@83) = DeserializedClassDescriptor@2['platformStatic'] // through LazyPackageFragmentScopeForJavaPackage@84
+    deserializedPackageScope = Empty@60 // through LazyPackageFragmentScopeForJavaPackage@84
+    functions('platformStatic': Name@85) = EmptyList@62[empty] // through LazyPackageFragmentScopeForJavaPackage@84
    memberIndex = computeMemberIndex$1@86 // through LazyPackageFragmentScopeForJavaPackage@84
 }
@@ -42,11 +42,11 @@ DeserializedTypeParameterDescriptor@25['T'] {
 }

 DeserializedType@29['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }

 DeserializedType@30['T in kotlin'] {
-    constructor = AbstractLazyTypeParameterDescriptor$1@26
+    constructor = AbstractLazyTypeParameterDescriptor$1@22
 }

 DeserializedType@31['T in kotlin'] {
@@ -91,146 +91,146 @@ DeserializedType@45['kotlin.deprecated'] {
 }

 LazyAnnotationDescriptor@47 {
-    _resolutionResults = OverloadResolutionResultsImpl@48
-    _type = JetTypeImpl@49['IAnn']
+    resolutionResults = OverloadResolutionResultsImpl@48
+    type = JetTypeImpl@49['IAnn']
 }

 LazyAnnotationDescriptor@50 {
-    _resolutionResults = OverloadResolutionResultsImpl@51
-    _type = JetTypeImpl@52['IAnn']
+    resolutionResults = OverloadResolutionResultsImpl@51
+    type = JetTypeImpl@52['IAnn']
 }

 LazyAnnotationDescriptor@53 {
-    _resolutionResults = OverloadResolutionResultsImpl@54
-    _type = JetTypeImpl@55['ann1']
-    _valueArguments(ValueParameterDescriptorImpl@56['p']) = AnnotationValue@57
+    resolutionResults = OverloadResolutionResultsImpl@54
+    type = JetTypeImpl@55['ann1']
+    valueArguments(ValueParameterDescriptorImpl@56['p']) = AnnotationValue@57
 }

 LazyAnnotationDescriptor@58 {
-    _resolutionResults = OverloadResolutionResultsImpl@59
-    _type = JetTypeImpl@60['ann1']
-    _valueArguments(ValueParameterDescriptorImpl@56['p']) = null
+    resolutionResults = OverloadResolutionResultsImpl@59
+    type = JetTypeImpl@60['ann1']
+    valueArguments(ValueParameterDescriptorImpl@56['p']) = null
 }

 LazyAnnotationDescriptor@61 {
-    _resolutionResults = OverloadResolutionResultsImpl@62
-    _type = JetTypeImpl@63['ann2']
-    _valueArguments(ValueParameterDescriptorImpl@64['p']) = AnnotationValue@65
+    resolutionResults = OverloadResolutionResultsImpl@62
+    type = JetTypeImpl@63['ann2']
+    valueArguments(ValueParameterDescriptorImpl@64['p']) = AnnotationValue@65
 }

 LazyAnnotationDescriptor@66 {
-    _resolutionResults = OverloadResolutionResultsImpl@67
-    _type = JetTypeImpl@68['ann3']
-    _valueArguments(ValueParameterDescriptorImpl@69['p']) = AnnotationValue@70
-    _valueArguments(ValueParameterDescriptorImpl@71['p2']) = null
+    resolutionResults = OverloadResolutionResultsImpl@67
+    type = JetTypeImpl@68['ann3']
+    valueArguments(ValueParameterDescriptorImpl@69['p']) = AnnotationValue@70
+    valueArguments(ValueParameterDescriptorImpl@71['p2']) = null
 }

 LazyAnnotationDescriptor@72 {
-    _resolutionResults = OverloadResolutionResultsImpl@73
-    _type = JetTypeImpl@74['ann3']
-    _valueArguments(ValueParameterDescriptorImpl@69['p']) = AnnotationValue@75
-    _valueArguments(ValueParameterDescriptorImpl@71['p2']) = null
+    resolutionResults = OverloadResolutionResultsImpl@73
+    type = JetTypeImpl@74['ann3']
+    valueArguments(ValueParameterDescriptorImpl@69['p']) = AnnotationValue@75
+    valueArguments(ValueParameterDescriptorImpl@71['p2']) = null
 }

 LazyAnnotationDescriptor@76 {
-    _resolutionResults = OverloadResolutionResultsImpl@77
-    _type = JetTypeImpl@78['annArray']
-    _valueArguments(ValueParameterDescriptorImpl@79['p']) = ArrayValue@80
+    resolutionResults = OverloadResolutionResultsImpl@77
+    type = JetTypeImpl@78['annArray']
+    valueArguments(ValueParameterDescriptorImpl@79['p']) = ArrayValue@80
 }

 LazyAnnotationDescriptor@81 {
-    _resolutionResults = OverloadResolutionResultsImpl@82
-    _type = JetTypeImpl@83['annJavaClass']
-    _valueArguments(ValueParameterDescriptorImpl@84['p']) = JavaClassValue@85
+    resolutionResults = OverloadResolutionResultsImpl@82
+    type = JetTypeImpl@83['annJavaClass']
+    valueArguments(ValueParameterDescriptorImpl@84['p']) = JavaClassValue@85
 }

 LazyAnnotationDescriptor@86 {
-    _resolutionResults = OverloadResolutionResultsImpl@87
-    _type = JetTypeImpl@88['deprecated']
-    _valueArguments(ValueParameterDescriptorImpl@89['value']) = StringValue@90
+    resolutionResults = OverloadResolutionResultsImpl@87
+    type = JetTypeImpl@88['deprecated']
+    valueArguments(ValueParameterDescriptorImpl@89['value']) = StringValue@90
 }

 LazyJavaClassDescriptor@91['Class'] {
-    _typeConstructor = LazyJavaClassTypeConstructor@34['Class']
+    typeConstructor = LazyJavaClassTypeConstructor@34['Class']
 }

 LazyJavaClassTypeConstructor@34['Class'] {
-    _parameters = ArrayList@92[1] { LazyJavaTypeParameterDescriptor@93['T'] }
+    parameters = ArrayList@92[1] { LazyJavaTypeParameterDescriptor@93['T'] }
 }

 LazyJavaPackageFragmentProvider@94 {
-    _packageFragments('<root>': FqName@95) = LazyJavaPackageFragment@96['<root>']
-    _packageFragments('A': FqName@97) = null
-    _packageFragments('Array': FqName@98) = null
-    _packageFragments('Class': FqName@99) = null
-    _packageFragments('String': FqName@100) = null
-    _packageFragments('a': FqName@101) = null
-    _packageFragments('a.b': FqName@102) = null
-    _packageFragments('a.b.c': FqName@103) = null
-    _packageFragments('a.b.c.A': FqName@104) = null
-    _packageFragments('a.b.c.Array': FqName@105) = null
-    _packageFragments('a.b.c.Class': FqName@106) = null
-    _packageFragments('a.b.c.String': FqName@107) = null
-    _packageFragments('a.b.c.a': FqName@108) = null
-    _packageFragments('a.b.c.ann1': FqName@109) = null
-    _packageFragments('a.b.c.ann2': FqName@110) = null
-    _packageFragments('a.b.c.ann3': FqName@111) = null
-    _packageFragments('a.b.c.annArray': FqName@112) = null
-    _packageFragments('a.b.c.annJavaClass': FqName@113) = null
-    _packageFragments('a.b.c.deprecated': FqName@114) = null
-    _packageFragments('a.b.c.kotlin': FqName@115) = null
-    _packageFragments('ann1': FqName@116) = null
-    _packageFragments('ann2': FqName@117) = null
-    _packageFragments('ann3': FqName@118) = null
-    _packageFragments('annArray': FqName@119) = null
-    _packageFragments('annJavaClass': FqName@120) = null
-    _packageFragments('deprecated': FqName@121) = null
-    _packageFragments('java': FqName@122) = LazyJavaPackageFragment@123['java']
-    _packageFragments('java.lang': FqName@124) = LazyJavaPackageFragment@125['lang']
-    _packageFragments('java.lang.A': FqName@126) = null
-    _packageFragments('java.lang.Array': FqName@127) = null
-    _packageFragments('java.lang.Class': FqName@128) = null
-    _packageFragments('java.lang.String': FqName@129) = null
-    _packageFragments('java.lang.ann1': FqName@130) = null
-    _packageFragments('java.lang.ann2': FqName@131) = null
-    _packageFragments('java.lang.ann3': FqName@132) = null
-    _packageFragments('java.lang.annArray': FqName@133) = null
-    _packageFragments('java.lang.annJavaClass': FqName@134) = null
-    _packageFragments('java.lang.deprecated': FqName@135) = null
-    _packageFragments('kotlin': FqName@136) = LazyJavaPackageFragment@17['kotlin']
-    _packageFragments('kotlin.A': FqName@137) = null
-    _packageFragments('kotlin.Array': FqName@138) = null
-    _packageFragments('kotlin.Class': FqName@139) = null
-    _packageFragments('kotlin.String': FqName@140) = null
-    _packageFragments('kotlin.ann1': FqName@141) = null
-    _packageFragments('kotlin.ann2': FqName@142) = null
-    _packageFragments('kotlin.ann3': FqName@143) = null
-    _packageFragments('kotlin.annArray': FqName@144) = null
-    _packageFragments('kotlin.annJavaClass': FqName@145) = null
-    _packageFragments('kotlin.deprecated': FqName@146) = null
-    _packageFragments('kotlin.io': FqName@147) = LazyJavaPackageFragment@148['io']
-    _packageFragments('kotlin.io.A': FqName@149) = null
-    _packageFragments('kotlin.io.Array': FqName@150) = null
-    _packageFragments('kotlin.io.Class': FqName@151) = null
-    _packageFragments('kotlin.io.String': FqName@152) = null
-    _packageFragments('kotlin.io.ann1': FqName@153) = null
-    _packageFragments('kotlin.io.ann2': FqName@154) = null
-    _packageFragments('kotlin.io.ann3': FqName@155) = null
-    _packageFragments('kotlin.io.annArray': FqName@156) = null
-    _packageFragments('kotlin.io.annJavaClass': FqName@157) = null
-    _packageFragments('kotlin.io.deprecated': FqName@158) = null
-    _packageFragments('kotlin.jvm': FqName@159) = LazyJavaPackageFragment@160['jvm']
-    _packageFragments('kotlin.jvm.A': FqName@161) = null
-    _packageFragments('kotlin.jvm.Array': FqName@162) = null
-    _packageFragments('kotlin.jvm.Class': FqName@163) = null
-    _packageFragments('kotlin.jvm.String': FqName@164) = null
-    _packageFragments('kotlin.jvm.ann1': FqName@165) = null
-    _packageFragments('kotlin.jvm.ann2': FqName@166) = null
-    _packageFragments('kotlin.jvm.ann3': FqName@167) = null
-    _packageFragments('kotlin.jvm.annArray': FqName@168) = null
-    _packageFragments('kotlin.jvm.annJavaClass': FqName@169) = null
-    _packageFragments('kotlin.jvm.deprecated': FqName@170) = null
-    _packageFragments('kotlin.jvm.internal': FqName@171) = LazyJavaPackageFragment@14['internal']
+    packageFragments('<root>': FqName@95) = LazyJavaPackageFragment@96['<root>']
+    packageFragments('A': FqName@97) = null
+    packageFragments('Array': FqName@98) = null
+    packageFragments('Class': FqName@99) = null
+    packageFragments('String': FqName@100) = null
+    packageFragments('a': FqName@101) = null
+    packageFragments('a.b': FqName@102) = null
+    packageFragments('a.b.c': FqName@103) = null
+    packageFragments('a.b.c.A': FqName@104) = null
+    packageFragments('a.b.c.Array': FqName@105) = null
+    packageFragments('a.b.c.Class': FqName@106) = null
+    packageFragments('a.b.c.String': FqName@107) = null
+    packageFragments('a.b.c.a': FqName@108) = null
+    packageFragments('a.b.c.ann1': FqName@109) = null
+    packageFragments('a.b.c.ann2': FqName@110) = null
+    packageFragments('a.b.c.ann3': FqName@111) = null
+    packageFragments('a.b.c.annArray': FqName@112) = null
+    packageFragments('a.b.c.annJavaClass': FqName@113) = null
+    packageFragments('a.b.c.deprecated': FqName@114) = null
+    packageFragments('a.b.c.kotlin': FqName@115) = null
+    packageFragments('ann1': FqName@116) = null
+    packageFragments('ann2': FqName@117) = null
+    packageFragments('ann3': FqName@118) = null
+    packageFragments('annArray': FqName@119) = null
+    packageFragments('annJavaClass': FqName@120) = null
+    packageFragments('deprecated': FqName@121) = null
+    packageFragments('java': FqName@122) = LazyJavaPackageFragment@123['java']
+    packageFragments('java.lang': FqName@124) = LazyJavaPackageFragment@125['lang']
+    packageFragments('java.lang.A': FqName@126) = null
+    packageFragments('java.lang.Array': FqName@127) = null
+    packageFragments('java.lang.Class': FqName@128) = null
+    packageFragments('java.lang.String': FqName@129) = null
+    packageFragments('java.lang.ann1': FqName@130) = null
+    packageFragments('java.lang.ann2': FqName@131) = null
+    packageFragments('java.lang.ann3': FqName@132) = null
+    packageFragments('java.lang.annArray': FqName@133) = null
+    packageFragments('java.lang.annJavaClass': FqName@134) = null
+    packageFragments('java.lang.deprecated': FqName@135) = null
+    packageFragments('kotlin': FqName@136) = LazyJavaPackageFragment@17['kotlin']
+    packageFragments('kotlin.A': FqName@137) = null
+    packageFragments('kotlin.Array': FqName@138) = null
+    packageFragments('kotlin.Class': FqName@139) = null
+    packageFragments('kotlin.String': FqName@140) = null
+    packageFragments('kotlin.ann1': FqName@141) = null
+    packageFragments('kotlin.ann2': FqName@142) = null
+    packageFragments('kotlin.ann3': FqName@143) = null
+    packageFragments('kotlin.annArray': FqName@144) = null
+    packageFragments('kotlin.annJavaClass': FqName@145) = null
+    packageFragments('kotlin.deprecated': FqName@146) = null
+    packageFragments('kotlin.io': FqName@147) = LazyJavaPackageFragment@148['io']
+    packageFragments('kotlin.io.A': FqName@149) = null
+    packageFragments('kotlin.io.Array': FqName@150) = null
+    packageFragments('kotlin.io.Class': FqName@151) = null
+    packageFragments('kotlin.io.String': FqName@152) = null
+    packageFragments('kotlin.io.ann1': FqName@153) = null
+    packageFragments('kotlin.io.ann2': FqName@154) = null
+    packageFragments('kotlin.io.ann3': FqName@155) = null
+    packageFragments('kotlin.io.annArray': FqName@156) = null
+    packageFragments('kotlin.io.annJavaClass': FqName@157) = null
+    packageFragments('kotlin.io.deprecated': FqName@158) = null
+    packageFragments('kotlin.jvm': FqName@159) = LazyJavaPackageFragment@160['jvm']
+    packageFragments('kotlin.jvm.A': FqName@161) = null
+    packageFragments('kotlin.jvm.Array': FqName@162) = null
+    packageFragments('kotlin.jvm.Class': FqName@163) = null
+    packageFragments('kotlin.jvm.String': FqName@164) = null
+    packageFragments('kotlin.jvm.ann1': FqName@165) = null
+    packageFragments('kotlin.jvm.ann2': FqName@166) = null
+    packageFragments('kotlin.jvm.ann3': FqName@167) = null
+    packageFragments('kotlin.jvm.annArray': FqName@168) = null
+    packageFragments('kotlin.jvm.annJavaClass': FqName@169) = null
+    packageFragments('kotlin.jvm.deprecated': FqName@170) = null
+    packageFragments('kotlin.jvm.internal': FqName@171) = LazyJavaPackageFragment@14['internal']
    topLevelClasses(JavaClassImpl@172['Class']) = LazyJavaClassDescriptor@91['Class']
 }

@@ -253,9 +253,9 @@ LazyJavaPackageFragment@148['io'] {
 }

 LazyJavaPackageFragment@123['java'] {
-    _functions('lang': Name@188) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@189
-    classes('lang': Name@190) = null // through LazyPackageFragmentScopeForJavaPackage@189
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@189
+    classes('lang': Name@188) = null // through LazyPackageFragmentScopeForJavaPackage@189
+    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@189
+    functions('lang': Name@191) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@189
    memberIndex = computeMemberIndex$1@192 // through LazyPackageFragmentScopeForJavaPackage@189
 }

@@ -266,50 +266,50 @@ LazyJavaPackageFragment@160['jvm'] {
    classes('a': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@193
    classes('deprecated': Name@180) = null // through LazyPackageFragmentScopeForJavaPackage@193
    classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@193
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@193
+    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@193
 }

 LazyJavaPackageFragment@17['kotlin'] {
-    _functions('array': Name@194) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    _functions('deprecated': Name@196) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    _functions('io': Name@197) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    _functions('javaClass': Name@198) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    _functions('jvm': Name@199) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('Any': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('Any': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@195
    classes('Array': Name@175) = null // through LazyPackageFragmentScopeForJavaPackage@195
    classes('Class': Name@177) = null // through LazyPackageFragmentScopeForJavaPackage@195
    classes('String': Name@178) = null // through LazyPackageFragmentScopeForJavaPackage@195
    classes('a': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('array': Name@194) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('array': Name@196) = null // through LazyPackageFragmentScopeForJavaPackage@195
    classes('deprecated': Name@180) = DeserializedClassDescriptor@4['deprecated'] // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('inline': Name@201) = DeserializedClassDescriptor@6['inline'] // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('io': Name@202) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('javaClass': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    classes('jvm': Name@203) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('inline': Name@197) = DeserializedClassDescriptor@6['inline'] // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('io': Name@198) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('javaClass': Name@199) = null // through LazyPackageFragmentScopeForJavaPackage@195
+    classes('jvm': Name@200) = null // through LazyPackageFragmentScopeForJavaPackage@195
    classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@195
-    deserializedPackageScope = DeserializedPackageMemberScope@204 // through LazyPackageFragmentScopeForJavaPackage@195
-    functions('array': Name@194) = ArrayList@205[1] { DeserializedSimpleFunctionDescriptor@206['array'] } // through DeserializedPackageMemberScope@204
-    functions('deprecated': Name@196) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    functions('io': Name@197) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    functions('javaClass': Name@198) = ArrayList@207[1] { DeserializedSimpleFunctionDescriptor@208['javaClass'] } // through DeserializedPackageMemberScope@204
-    functions('jvm': Name@199) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
+    deserializedPackageScope = DeserializedPackageMemberScope@201 // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('array': Name@196) = ArrayList@202[1] { DeserializedSimpleFunctionDescriptor@203['array'] } // through DeserializedPackageMemberScope@201
+    functions('array': Name@196) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('deprecated': Name@204) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    functions('deprecated': Name@204) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('io': Name@205) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    functions('io': Name@205) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('javaClass': Name@199) = ArrayList@206[1] { DeserializedSimpleFunctionDescriptor@207['javaClass'] } // through DeserializedPackageMemberScope@201
+    functions('javaClass': Name@199) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
+    functions('jvm': Name@208) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    functions('jvm': Name@208) = EmptyList@185[empty] // through LazyPackageFragmentScopeForJavaPackage@195
    memberIndex = computeMemberIndex$1@209 // through LazyPackageFragmentScopeForJavaPackage@195
-    membersProtos = HashMap@210 // through DeserializedPackageMemberScope@204
-    properties('A': Name@184) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    properties('a': Name@186) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    properties('array': Name@194) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    properties('deprecated': Name@196) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    properties('io': Name@197) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    properties('javaClass': Name@198) = ArrayList@211[1] { DeserializedPropertyDescriptor@212['javaClass'] } // through DeserializedPackageMemberScope@204
-    properties('jvm': Name@199) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
-    properties('kotlin': Name@187) = EmptyList@185[empty] // through DeserializedPackageMemberScope@204
+    membersProtos = HashMap@210 // through DeserializedPackageMemberScope@201
+    properties('A': Name@184) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    properties('a': Name@186) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    properties('array': Name@196) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    properties('deprecated': Name@204) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    properties('io': Name@205) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    properties('javaClass': Name@199) = ArrayList@211[1] { DeserializedPropertyDescriptor@212['javaClass'] } // through DeserializedPackageMemberScope@201
+    properties('jvm': Name@208) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
+    properties('kotlin': Name@187) = EmptyList@185[empty] // through DeserializedPackageMemberScope@201
 }

 LazyJavaPackageFragment@125['lang'] {
    classes('Class': Name@177) = LazyJavaClassDescriptor@91['Class'] // through LazyPackageFragmentScopeForJavaPackage@213
    classes('a': Name@179) = null // through LazyPackageFragmentScopeForJavaPackage@213
    classes('kotlin': Name@181) = null // through LazyPackageFragmentScopeForJavaPackage@213
-    deserializedPackageScope = Empty@191 // through LazyPackageFragmentScopeForJavaPackage@213
+    deserializedPackageScope = Empty@190 // through LazyPackageFragmentScopeForJavaPackage@213
 }

 LazyJavaTypeParameterDescriptor@93['T'] {